Updated to 2.0.0-beta.9

* include arduino_secrets when needed

Co-authored-by: Alberto Iannaccone <a.iannaccone@arduino.cc>

.eslintrc.js

@@ -0,0 +1,65 @@
+module.exports = {
+    parser: '@typescript-eslint/parser', // Specifies the ESLint parser
+    parserOptions: {
+        ecmaVersion: 2020, // Allows for the parsing of modern ECMAScript features
+        sourceType: 'module', // Allows for the use of imports
+        ecmaFeatures: {
+            jsx: true, // Allows for the parsing of JSX
+        },
+    },
+    ignorePatterns: [
+        'node_modules/*',
+        '**/node_modules/*',
+        '.node_modules/*',
+        '.github/*',
+        '.browser_modules/*',
+        'docs/*',
+        'scripts/*',
+        'electron/*',
+        'electron-app/*',
+        'browser-app/*',
+        'plugins/*',
+        'arduino-ide-extension/src/node/cli-protocol',
+    ],
+    settings: {
+        react: {
+            version: 'detect', // Tells eslint-plugin-react to automatically detect the version of React to use
+        },
+    },
+    extends: [
+        'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin
+        'plugin:react/recommended', // Uses the recommended rules from @eslint-plugin-react
+        'plugin:react-hooks/recommended', // Uses recommended rules from react hooks
+        'plugin:prettier/recommended',
+        'prettier', // Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
+    ],
+    plugins: ['prettier', 'unused-imports'],
+    rules: {
+        '@typescript-eslint/no-unused-expressions': 'off',
+        '@typescript-eslint/no-namespace': 'off',
+        '@typescript-eslint/no-var-requires': 'off',
+        '@typescript-eslint/no-empty-function': 'warn',
+        '@typescript-eslint/no-empty-interface': 'warn',
+        'no-unused-vars': 'off',
+        'unused-imports/no-unused-imports': 'error',
+        'unused-imports/no-unused-vars': [
+            'warn',
+            {
+                vars: 'all',
+                varsIgnorePattern: '^_',
+                args: 'after-used',
+                argsIgnorePattern: '^_',
+            },
+        ],
+        'react/display-name': 'warn',
+        eqeqeq: ['error', 'smart'],
+        'guard-for-in': 'off',
+        'id-blacklist': 'off',
+        'id-match': 'off',
+        'no-underscore-dangle': 'off',
+        'no-unused-expressions': 'off',
+        'no-var': 'error',
+        radix: 'error',
+        'prettier/prettier': 'warn',
+    },
+};

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: 'type: bug'
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows]
+ - Version: [e.g. 2.0.0]
+
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'type: enhancement'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/workflows/build.yml

@@ -1,28 +1,31 @@
-name: Arduino Pro IDE
+name: Arduino IDE
 
 on:
   push:
     branches:
-      - master
+      - main
     tags:
       - '[0-9]+.[0-9]+.[0-9]+*'
   workflow_dispatch:
   pull_request:
     branches:
-      - master
+      - main
   schedule:
     - cron: '0 3 * * *' # run every day at 3AM (https://docs.github.com/en/actions/reference/events-that-trigger-workflows#scheduled-events-schedule)
 
+env:
+  JOB_TRANSFER_ARTIFACT: build-artifacts
+
 jobs:
 
   build:
+    if: github.repository == 'arduino/arduino-ide'
     strategy:
       matrix:
         config:
           - os: windows-latest
-          - os: ubuntu-latest
+          - os: ubuntu-18.04 # https://github.com/arduino/arduino-ide/issues/259
           - os: macos-latest
-          # - os: rsora-rpi-arm # self-hosted armhf
     runs-on: ${{ matrix.config.os }}
     timeout-minutes: 90
 
@@ -44,29 +47,33 @@ jobs:
       - name: Package
         shell: bash
         env:
-          PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           AC_USERNAME: ${{ secrets.AC_USERNAME }}
           AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          IS_NIGHTLY: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master') }}
+          IS_NIGHTLY: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') }}
           IS_RELEASE: ${{ startsWith(github.ref, 'refs/tags/') }}
+          IS_FORK: ${{ github.event.pull_request.head.repo.fork == true }}
         run: |
             # See: https://www.electron.build/code-signing
-            if [ "${{ runner.OS }}" = "macOS" ]; then
-              export CSC_LINK="${{ runner.temp }}/signing_certificate.p12"
-              # APPLE_SIGNING_CERTIFICATE_P12 secret was produced by following the procedure from:
-              # https://www.kencochrane.com/2020/08/01/build-and-sign-golang-binaries-for-macos-with-github-actions/#exporting-the-developer-certificate
-              echo "${{ secrets.APPLE_SIGNING_CERTIFICATE_P12 }}" | base64 --decode > "$CSC_LINK"
+            if [ $IS_FORK = true ]; then
+              echo "Skipping the app signing: building from a fork."
+            else
+              if [ "${{ runner.OS }}" = "macOS" ]; then
+                export CSC_LINK="${{ runner.temp }}/signing_certificate.p12"
+                # APPLE_SIGNING_CERTIFICATE_P12 secret was produced by following the procedure from:
+                # https://www.kencochrane.com/2020/08/01/build-and-sign-golang-binaries-for-macos-with-github-actions/#exporting-the-developer-certificate
+                echo "${{ secrets.APPLE_SIGNING_CERTIFICATE_P12 }}" | base64 --decode > "$CSC_LINK"
 
-              export CSC_KEY_PASSWORD="${{ secrets.KEYCHAIN_PASSWORD }}"
+                export CSC_KEY_PASSWORD="${{ secrets.KEYCHAIN_PASSWORD }}"
 
-            elif [ "${{ runner.OS }}" = "Windows" ]; then
-              export CSC_LINK="${{ runner.temp }}/signing_certificate.pfx"
-              echo "${{ secrets.WINDOWS_SIGNING_CERTIFICATE_PFX }}" | base64 --decode > "$CSC_LINK"
+              elif [ "${{ runner.OS }}" = "Windows" ]; then
+                export CSC_LINK="${{ runner.temp }}/signing_certificate.pfx"
+                echo "${{ secrets.WINDOWS_SIGNING_CERTIFICATE_PFX }}" | base64 --decode > "$CSC_LINK"
 
-              export CSC_KEY_PASSWORD="${{ secrets.WINDOWS_SIGNING_CERTIFICATE_PASSWORD }}"
+                export CSC_KEY_PASSWORD="${{ secrets.WINDOWS_SIGNING_CERTIFICATE_PASSWORD }}"
+              fi
             fi
 
             yarn --cwd ./electron/packager/
@@ -75,9 +82,42 @@ jobs:
       - name: Upload [GitHub Actions]
         uses: actions/upload-artifact@v2
         with:
-          name: build-artifacts
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
           path: electron/build/dist/build-artifacts/
 
+  artifacts:
+    name: ${{ matrix.artifact.name }} artifact
+    needs: build
+    if: always() && needs.build.result != 'skipped'
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        artifact:
+          - path: "*Linux_64bit.zip"
+            name: Linux_X86-64
+          - path: "*macOS_64bit.dmg"
+            name: macOS
+          - path: "*Windows_64bit.exe"
+            name: Windows_X86-64_interactive_installer
+          - path: "*Windows_64bit.msi"
+            name: Windows_X86-64_MSI
+          - path: "*Windows_64bit.zip"
+            name: Windows_X86-64_zip
+
+    steps:
+      - name: Download job transfer artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          path: ${{ env.JOB_TRANSFER_ARTIFACT }}
+      
+      - name: Upload tester build artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: ${{ matrix.artifact.name }}
+          path: ${{ env.JOB_TRANSFER_ARTIFACT }}/${{ matrix.artifact.path }}
+
   changelog:
     needs: build
     runs-on: ubuntu-latest
@@ -99,7 +139,7 @@ jobs:
             if [ "$IS_RELEASE" = true ]; then
               export BODY=$(echo -e "$GIT_LOG")
             else 
-              export LATEST_TAG_WITH_LINK=$(echo "[$LATEST_TAG](https://github.com/arduino/arduino-pro-ide/releases/tag/$LATEST_TAG)")
+              export LATEST_TAG_WITH_LINK=$(echo "[$LATEST_TAG](https://github.com/arduino/arduino-ide/releases/tag/$LATEST_TAG)")
               if [ -z "$GIT_LOG" ]; then
                   export BODY="There were no changes since version $LATEST_TAG_WITH_LINK."
               else
@@ -114,43 +154,43 @@ jobs:
             echo "$BODY" > CHANGELOG.txt
 
       - name: Upload Changelog [GitHub Actions]
-        if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master')
+        if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main')
         uses: actions/upload-artifact@v2
         with:
-          name: build-artifacts
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
           path: CHANGELOG.txt
 
   publish:
     needs: changelog
-    if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master')
+    if: github.repository == 'arduino/arduino-ide' && (github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main'))
     runs-on: ubuntu-latest
     steps:
       - name: Download [GitHub Actions]
         uses: actions/download-artifact@v2
         with:
-          name: build-artifacts
-          path: build-artifacts
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          path: ${{ env.JOB_TRANSFER_ARTIFACT }}
 
       - name: Publish Nightly [S3]
         uses: docker://plugins/s3
         env:
-          PLUGIN_SOURCE: "build-artifacts/*"
-          PLUGIN_STRIP_PREFIX: "build-artifacts/"
-          PLUGIN_TARGET: "/arduino-pro-ide/nightly"
+          PLUGIN_SOURCE: "${{ env.JOB_TRANSFER_ARTIFACT }}/*"
+          PLUGIN_STRIP_PREFIX: "${{ env.JOB_TRANSFER_ARTIFACT }}/"
+          PLUGIN_TARGET: "/arduino-ide/nightly"
           PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
   release:
     needs: changelog
-    if: startsWith(github.ref, 'refs/tags/')
+    if: github.repository == 'arduino/arduino-ide' && startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
       - name: Download [GitHub Actions]
         uses: actions/download-artifact@v2
         with:
-          name: build-artifacts
-          path: build-artifacts
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          path: ${{ env.JOB_TRANSFER_ARTIFACT }}
 
       - name: Get Tag
         id: tag_name
@@ -160,10 +200,9 @@ jobs:
       - name: Publish Release [GitHub]
         uses: svenstaro/upload-release-action@2.2.0
         with:
-          repo_token: ${{ secrets.RELEASE_TOKEN }}
-          repo_name: arduino/arduino-pro-ide
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
           release_name: ${{ steps.tag_name.outputs.TAG_NAME }}
-          file: build-artifacts/*
+          file: ${{ env.JOB_TRANSFER_ARTIFACT }}/*
           tag: ${{ github.ref }}
           file_glob: true
           body: ${{ needs.changelog.outputs.BODY }}
@@ -171,9 +210,25 @@ jobs:
       - name: Publish Release [S3]
         uses: docker://plugins/s3
         env:
-          PLUGIN_SOURCE: "build-artifacts/*"
-          PLUGIN_STRIP_PREFIX: "build-artifacts/"
-          PLUGIN_TARGET: "/arduino-pro-ide"
+          PLUGIN_SOURCE: "${{ env.JOB_TRANSFER_ARTIFACT }}/*"
+          PLUGIN_STRIP_PREFIX: "${{ env.JOB_TRANSFER_ARTIFACT }}/"
+          PLUGIN_TARGET: "/arduino-ide"
           PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+  clean:
+    # This job must run after all jobs that use the transfer artifact.
+    needs:
+      - build
+      - publish
+      - release
+      - artifacts
+    if: always() && needs.build.result != 'skipped'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Remove unneeded job transfer artifact
+        uses: geekyeggo/delete-artifact@v1
+        with:
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}

.github/workflows/check-certificates.yml

@@ -15,6 +15,11 @@ env:
 
 jobs:
   check-certificates:
+    # Only run when the workflow will have access to the certificate secrets.
+    if: >
+      (github.event_name != 'pull_request' && github.repository == 'arduino/arduino-ide') ||
+      (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'arduino/arduino-ide')
+    
     runs-on: ubuntu-latest
 
     strategy:

.gitpod.yml

@@ -1,24 +0,0 @@
-image:
-  file: Dockerfile
-
-ports:
-  - port: 3000
-    onOpen: open-preview
-  - port: 5900
-    onOpen: ignore
-  - port: 6080
-    onOpen: ignore
-
-tasks:
-  - init: >
-      yarn &&
-      yarn --cwd ./browser-app start
-
-github:
-  prebuilds:
-    master: true
-    branches: true
-    pullRequests: true
-    pullRequestsFromForks: true
-    addComment: false
-    addBadge: false

.prettierrc

@@ -0,0 +1,13 @@
+{
+	"singleQuote": true,
+	"tabWidth": 4,
+	"useTabs": false,
+	"overrides": [
+		{
+			"files": "*.{json,yml}",
+			"options": {
+				"tabWidth": 2
+			}
+		}
+	]
+}

.vscode/launch.json

@@ -1,22 +1,6 @@
 {
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
-    {
-      "type": "node",
-      "request": "attach",
-      "name": "Attach by Process ID",
-      "processId": "${command:PickProcess}"
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Electron Packager",
-      "program": "${workspaceRoot}/electron/packager/index.js",
-      "cwd": "${workspaceFolder}/electron/packager"
-    },
     {
       "type": "node",
       "request": "launch",
@@ -29,15 +13,17 @@
           "NODE_PRESERVE_SYMLINKS": "1"
         }
       },
-      "program": "${workspaceRoot}/electron-app/src-gen/frontend/electron-main.js",
+      "cwd": "${workspaceFolder}/electron-app",
       "protocol": "inspector",
       "args": [
+        ".",
         "--log-level=debug",
         "--hostname=localhost",
         "--no-cluster",
+        "--app-project-path=${workspaceRoot}/electron-app",
         "--remote-debugging-port=9222",
         "--no-app-auto-install",
-        "--plugins=local-dir:plugins"
+        "--plugins=local-dir:../plugins"
       ],
       "env": {
         "NODE_ENV": "development"
@@ -104,6 +90,19 @@
       "smartStep": true,
       "internalConsoleOptions": "openOnSessionStart",
       "outputCapture": "std"
+    },
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Attach by Process ID",
+      "processId": "${command:PickProcess}"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Electron Packager",
+      "program": "${workspaceRoot}/electron/packager/index.js",
+      "cwd": "${workspaceFolder}/electron/packager"
     }
   ]
 }

.vscode/settings.json

@@ -1,21 +1,9 @@
 {
-  "tslint.enable": true,
-  "tslint.configFile": "./tslint.json",
-  "editor.formatOnSave": true,
   "files.exclude": {
     "**/lib": false
   },
-  "editor.insertSpaces": true,
-  "editor.detectIndentation": false,
-  "[typescript]": {
-    "editor.tabSize": 4
+  "typescript.tsdk": "node_modules/typescript/lib",
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
   },
-  "[json]": {
-    "editor.tabSize": 2
-  },
-  "[jsonc]": {
-    "editor.tabSize": 2
-  },
-  "files.insertFinalNewline": true,
-  "typescript.tsdk": "node_modules/typescript/lib"
 }

.vscode/tasks.json

@@ -1,10 +1,8 @@
 {
-  // See https://go.microsoft.com/fwlink/?LinkId=733558
-  // for the documentation about the tasks.json format
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Arduino Pro IDE - Rebuild Electron App",
+      "label": "Arduino IDE - Rebuild Electron App",
       "type": "shell",
       "command": "yarn rebuild:browser && yarn rebuild:electron",
       "group": "build",
@@ -15,7 +13,7 @@
       }
     },
     {
-      "label": "Arduino Pro IDE - Start Browser App",
+      "label": "Arduino IDE - Start Browser App",
       "type": "shell",
       "command": "yarn --cwd ./browser-app start",
       "group": "build",
@@ -26,7 +24,7 @@
       }
     },
     {
-      "label": "Arduino Pro IDE - Watch IDE Extension",
+      "label": "Arduino IDE - Watch IDE Extension",
       "type": "shell",
       "command": "yarn --cwd ./arduino-ide-extension watch",
       "group": "build",
@@ -35,9 +33,9 @@
         "panel": "new",
         "clear": false
       }
-    }
+    },
     {
-      "label": "Arduino Pro IDE - Watch Browser App",
+      "label": "Arduino IDE - Watch Browser App",
       "type": "shell",
       "command": "yarn --cwd ./browser-app watch",
       "group": "build",
@@ -48,7 +46,7 @@
       }
     },
     {
-      "label": "Arduino Pro IDE - Watch Electron App",
+      "label": "Arduino IDE - Watch Electron App",
       "type": "shell",
       "command": "yarn --cwd ./electron-app watch",
       "group": "build",
@@ -59,19 +57,19 @@
       }
     },
     {
-      "label": "Arduino Pro IDE - Watch All [Browser]",
+      "label": "Arduino IDE - Watch All [Browser]",
       "type": "shell",
       "dependsOn": [
-        "Arduino Pro IDE - Watch IDE Extension",
-        "Arduino Pro IDE - Watch Browser App"
+        "Arduino IDE - Watch IDE Extension",
+        "Arduino IDE - Watch Browser App"
       ]
     },
     {
-      "label": "Arduino Pro IDE - Watch All [Electron]",
+      "label": "Arduino IDE - Watch All [Electron]",
       "type": "shell",
       "dependsOn": [
-        "Arduino Pro IDE - Watch IDE Extension",
-        "Arduino Pro IDE - Watch Electron App"
+        "Arduino IDE - Watch IDE Extension",
+        "Arduino IDE - Watch Electron App"
       ]
     }
   ]

BUILDING.md

@@ -0,0 +1,136 @@
+# Development
+
+This page includes technical documentation for developers who want to build the IDE locally and contribute to the project.
+
+## Architecture overview
+
+The IDE consists of three major parts:
+ - the _Electron main_ process,
+ - the _backend_, and 
+ - the _frontend_.
+
+The _Electron main_ process is responsible for:
+ - creating the application,
+ - managing the application lifecycle via listeners, and
+ - creating and managing the web pages for the app.
+
+In Electron, the process that runs the main entry JavaScript file is called the main process. The _Electron main_ process can display a GUI by creating web pages. An Electron app always has exactly on main process.
+
+By default, whenever the _Electron main_ process creates a web page, it will instantiate a new `BrowserWindow` instance. Since Electron uses Chromium for displaying web pages, Chromium's multi-process architecture is also used. Each web page in Electron runs in its own process, which is called the renderer process. Each `BrowserWindow` instance runs the web page in its own renderer process. When a `BrowserWindow` instance is destroyed, the corresponding renderer process is also terminated. The main process manages all web pages and their corresponding renderer processes. Each renderer process is isolated and only cares about the web page running in it.<sup>[[1]]</sup>
+
+In normal browsers, web pages usually run in a sandboxed environment, and accessing native resources are disallowed. However, Electron has the power to use Node.js APIs in the web pages allowing lower-level OS interactions. Due to security reasons, accessing native resources is an undesired behavior in the IDE. So by convention, we do not use Node.js APIs. (Note: the Node.js integration is [not yet disabled](https://github.com/eclipse-theia/theia/issues/2018) although it is not used). In the IDE, only the _backend_ allows OS interaction.
+
+The _backend_ process is responsible for:
+ - providing access to the filesystem,
+ - communicating with the [Arduino CLI](https://github.com/arduino/arduino-cli) via gRPC,
+ - running your terminal,
+ - exposing additional RESTful APIs,
+ - performing the Git commands in the local repositories,
+ - hosting and running any VS Code extensions, or
+ - executing VS Code tasks<sup>[[2]]</sup>.
+
+The _Electron main_ process spawns the _backend_ process. There is always exactly one _backend_ process. However, due to performance considerations, the _backend_ spawns several sub-processes for the filesystem watching, Git repository discovery, etc. The communication between the _backend_ process and its sub-processes is established via IPC. Besides spawning sub-processes, the _backend_ will start an HTTP server on a random available port, and serves the web application as static content. When the sub-processes are up and running, and the HTTP server is also listening, the _backend_ process sends the HTTP server port to the _Electron main_ process via IPC. The _Electron main_ process will load the _backend_'s endpoint in the `BrowserWindow`.
+
+The _frontend_ is running as an Electron renderer process and can invoke services implemented on the _backend_. The communication between the _backend_ and the _frontend_ is done via JSON-RPC over a websocket connection. This means, the services running in the _frontend_ are all proxies, and will ask the corresponding service implementation on the _backend_.
+
+[1]: https://www.electronjs.org/docs/tutorial/application-architecture#differences-between-main-process-and-renderer-process
+[2]: https://code.visualstudio.com/Docs/editor/tasks
+
+
+## Build from source
+
+If you’re familiar with TypeScript, the [Theia IDE](https://theia-ide.org/), and if you want to contribute to the
+project, you should be able to build the Arduino IDE locally. Please refer to the [Theia IDE prerequisites](https://github.com/theia-ide/theia/blob/master/doc/) documentation for the setup instructions.
+
+### Build
+```sh
+yarn
+```
+
+### Rebuild the native dependencies
+```sh
+yarn rebuild:electron
+```
+
+### Start
+```sh
+yarn start
+```
+
+### CI
+
+This project is built on [GitHub Actions](https://github.com/arduino/arduino-ide/actions).
+
+ - _Snapshot_ builds run when changes are pushed to the `main` branch, or when a PR is created against the `main` branch. For the sake of the review and verification process, the build artifacts for each operating system can be downloaded from the GitHub Actions page.
+ - _Nightly_ builds run every day at 03:00 GMT from the `main` branch.
+ - _Release_ builds run when a new tag is pushed to the remote. The tag must follow the [semver](https://semver.org/). For instance, `1.2.3` is a correct tag, but `v2.3.4` won't work. Steps to trigger a new release build:
+   - Create a local tag:
+    ```sh
+    git tag -a 1.2.3 -m "Creating a new tag for the `1.2.3` release."
+    ```
+   - Push it to the remote:
+   ```sh
+    git push origin 1.2.3
+   ```
+
+## Notes for macOS contributors
+Beginning in macOS 10.14.5, the software [must be notarized to run](https://developer.apple.com/documentation/xcode/notarizing_macos_software_before_distribution). The signing and notarization processes for the Arduino IDE are managed by our Continuous Integration (CI) workflows, implemented with GitHub Actions. On every push and pull request, the Arduino IDE is built and saved to a workflow artifact. These artifacts can be used by contributors and beta testers who don't want to set up a build system locally.
+For security reasons, signing and notarization are disabled for workflow runs for pull requests from forks of this repository. This means that macOS will block you from running those artifacts.
+Due to this limitation, Mac users have two options for testing contributions from forks:
+
+### The Safe approach (recommended)
+
+Follow [the instructions above](#build-from-source) to create the build environment locally, then build the code you want to test.
+
+### The Risky approach
+
+*Please note that this approach is risky as you are lowering the security on your system, therefore we strongly discourage you from following it.*
+1. Use [this guide](https://help.apple.com/xcode/mac/10.2/index.html?localePath=en.lproj#/dev9b7736b0e), in order to disable Gatekeeper (at your own risk!).
+1. Download the unsigned artifact provided by the CI workflow run related to the Pull Request at each push.
+1. Re-enable Gatekeeper after tests are done, following the guide linked above.
+
+### Creating a release
+
+You will not need to create a new release yourself as the Arduino team takes care of this on a regular basis, but we are documenting the process here. Let's assume the current version is `0.1.3` and you want to release `0.2.0`.
+
+ - Make sure the `main` state represents what you want to release and you're on `main`.
+ - Prepare a release-candidate build on a branch:
+```bash
+git branch 0.2.0-rc \
+&& git checkout 0.2.0-rc
+```
+ - Bump up the version number. It must be a valid [semver](https://semver.org/) and must be greater than the current one:
+```bash
+yarn update:version 0.2.0
+```
+ - This should generate multiple outgoing changes with the version update.
+ - Commit your changes and push to the remote:
+```bash
+git add . \
+&& git commit -s -m "Updated versions to 0.2.0" \
+&& git push
+```
+ - Create the GH PR the workflow starts automatically.
+ - Once you're happy with the RC, merge the changes to the `main`.
+ - Create a tag and push it:
+```bash
+git tag -a 0.2.0 -m "0.2.0" \
+&& git push origin 0.2.0
+```
+ - The release build starts automatically and uploads the artifacts with the changelog to the  [release page](https://github.com/arduino/arduino-ide/releases).
+ - If you do not want to release the `EXE` and `MSI` installers, wipe them manually.
+ - If you do not like the generated changelog, modify it and update the GH release.
+
+## FAQ
+
+* *Can I manually change the version of the [`arduino-cli`](https://github.com/arduino/arduino-cli/) used by the IDE?*
+
+    Yes. It is possible but not recommended. The CLI exposes a set of functionality via [gRPC](https://github.com/arduino/arduino-cli/tree/master/rpc) and the IDE uses this API to communicate with the CLI. Before we build a new version of IDE, we pin a specific version of CLI and use the corresponding `proto` files to generate TypeScript modules for gRPC. This means, a particular version of IDE is compliant only with the pinned version of CLI. Mismatching IDE and CLI versions might not be able to communicate with each other. This could cause unpredictable IDE behavior.
+
+* *I have understood that not all versions of the CLI are compatible with my version of IDE but how can I manually update the `arduino-cli` inside the IDE?*
+
+    [Get](https://arduino.github.io/arduino-cli/installation) the desired version of `arduino-cli` for your platform and manually replace the one inside the IDE. The CLI can be found inside the IDE at:
+    - Windows: `C:\path\to\Arduino IDE\resources\app\node_modules\arduino-ide-extension\build\arduino-cli.exe`,
+    - macOS: `/path/to/Arduino IDE.app/Contents/Resources/app/node_modules/arduino-ide-extension/build/arduino-cli`, and
+    - Linux: `/path/to/Arduino IDE/resources/app/node_modules/arduino-ide-extension/build/arduino-cli`.
+

Dockerfile

@@ -1,19 +0,0 @@
-FROM gitpod/workspace-full-vnc
-
-USER root
-RUN apt-get update -q --fix-missing && \
-    apt-get install -y -q software-properties-common && \
-    apt-get install -y -q --no-install-recommends \
-    build-essential \
-    libssl-dev \
-    golang-go \
-    libxkbfile-dev \
-    libnss3-dev
-
-RUN set -ex && \
-    tmpdir=$(mktemp -d) && \
-    curl -L -o $tmpdir/protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v3.6.1/protoc-3.6.1-linux-x86_64.zip && \
-    mkdir -p /usr/lib/protoc && cd /usr/lib/protoc && unzip $tmpdir/protoc.zip && \
-    chmod -R 755 /usr/lib/protoc/include/google && \
-    ln -s /usr/lib/protoc/bin/* /usr/bin && \
-    rm $tmpdir/protoc.zip

LICENSE.txt

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

README.md

@@ -1,36 +1,24 @@
-# Arduino Pro IDE
+<img src="https://content.arduino.cc/website/Arduino_logo_teal.svg" height="100" align="right" />
 
-[![Arduino Pro IDE](https://github.com/bcmi-labs/arduino-editor/workflows/Arduino%20Pro%20IDE/badge.svg)](https://github.com/bcmi-labs/arduino-editor/actions?query=workflow%3A%22Arduino+Pro+IDE%22)
+# Arduino IDE 2.x (beta)
 
-### Download
+[![Arduino IDE](https://github.com/arduino/arduino-ide/workflows/Arduino%20IDE/badge.svg)](https://github.com/arduino/arduino-ide/actions?query=workflow%3A%22Arduino+IDE%22)
 
-You can download the latest version of the Arduino Pro IDE application for the supported platforms from the [GitHub release page](https://github.com/arduino/arduino-pro-ide/releases) or following the links in the following table.
+This repository contains the source code of the Arduino IDE 2.x, which is currently in beta stage. If you're looking for the stable IDE, go to the repository of the 1.x version at https://github.com/arduino/Arduino.
 
-#### Latest version
+The Arduino IDE 2.x is a major rewrite, sharing no code with the IDE 1.x. It is based on the [Theia IDE](https://theia-ide.org/) framework and built with [Electron](https://www.electronjs.org/). The backend operations such as compilation and uploading are offloaded to an [arduino-cli](https://github.com/arduino/arduino-cli) instance running in daemon mode. This new IDE was developed with the goal of preserving the same interface and user experience of the previous major version in order to provide a frictionless upgrade.
 
-Platform  | 32 bit                   | 64 bit                                                                         |
---------- | ------------------------ | ------------------------------------------------------------------------------ |
-Linux     |                          | [Linux 64 bit]                                                                 |
-Linux ARM | [🚧 Work in progress...] | [🚧 Work in progress...]                                                      |
-Windows   |                          | [Windows 64 bit installer]<br />[Windows 64 bit MSI]<br />[Windows 64 bit ZIP] |
-macOS     |                          | [macOS 64 bit]                                                                 |
+> ⚠️ This is **beta** software. Help us test it!
 
-[🚧 Work in progress...]: https://github.com/arduino/arduino-pro-ide/issues/287
-[Linux 64 bit]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_Linux_64bit.zip
-[Windows 64 bit installer]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_Windows_64bit.exe
-[Windows 64 bit MSI]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_Windows_64bit.msi
-[Windows 64 bit ZIP]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_Windows_64bit.zip
-[macOS 64 bit]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_macOS_64bit.dmg
+![](static/screenshot.png)
 
-#### Previous versions
+## Download
 
-These are available from the [GitHub releases page](https://github.com/arduino/arduino-pro-ide/releases).
+You can download the latest version from the [software download page on the Arduino website](https://www.arduino.cc/en/software#experimental-software).
+### Nightly builds
 
-#### Nightly builds
-
-These builds are generated every day at 03:00 GMT from the `master` branch and
-should be considered unstable. In order to get the latest nightly build
-available for the supported platform, use the following links:
+These builds are generated every day at 03:00 GMT from the `main` branch and
+should be considered unstable:
 
 Platform  | 32 bit                   | 64 bit                                                                                                 |
 --------- | ------------------------ | ------------------------------------------------------------------------------------------------------ |
@@ -39,95 +27,51 @@ Linux ARM | [🚧 Work in progress...] | [🚧 Work in progress...]
 Windows   |                          | [Nightly Windows 64 bit installer]<br />[Nightly Windows 64 bit MSI]<br />[Nightly Windows 64 bit ZIP] |
 macOS     |                          | [Nightly macOS 64 bit]                                                                                 |
 
-[🚧 Work in progress...]: https://github.com/arduino/arduino-pro-ide/issues/287
-[Nightly Linux 64 bit]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_Linux_64bit.zip
-[Nightly Windows 64 bit installer]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_Windows_64bit.exe
-[Nightly Windows 64 bit MSI]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_Windows_64bit.msi
-[Nightly Windows 64 bit ZIP]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_Windows_64bit.zip
-[Nightly macOS 64 bit]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_macOS_64bit.dmg
+[🚧 Work in progress...]: https://github.com/arduino/arduino-ide/issues/107
+[Nightly Linux 64 bit]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_Linux_64bit.zip
+[Nightly Windows 64 bit installer]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_Windows_64bit.exe
+[Nightly Windows 64 bit MSI]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_Windows_64bit.msi
+[Nightly Windows 64 bit ZIP]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_Windows_64bit.zip
+[Nightly macOS 64 bit]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_macOS_64bit.dmg
 
 > These links return an HTTP `302: Found` response, redirecting to latest
   generated builds by replacing `latest` with the latest available build
   date, using the format YYYYMMDD (i.e for 2019/Aug/06 `latest` is
-  replaced with `20190806` )
+  replaced with `20190806`)
 
-### Build from source
+## Support
 
-If you’re familiar with TypeScript, the [Theia IDE](https://theia-ide.org/), and if you want to contribute to the
-project, you should be able to build the Arduino Pro IDE locally. Please refer to the [Theia IDE prerequisites](https://github.com/theia-ide/theia/blob/master/doc/) documentation for the setup instructions.
+If you need assistance, see the [Help Center](https://support.arduino.cc/hc/en-us/categories/360002212660-Software-and-Downloads) and browse the [forum](https://forum.arduino.cc/index.php?board=150.0).
 
-### Build
-```sh
-yarn
-```
+## Bugs & Issues
 
-### Rebuild the native dependencies
-```sh
-yarn rebuild:electron
-```
+If you want to report an issue, you can submit it to the [issue tracker](https://github.com/arduino/arduino-ide/issues) of this repository. A few rules apply:
 
-### Start
-```sh
-yarn start
-```
+* Before posting, please check if the same problem has been already reported by someone else to avoid duplicates.
+* Remember to include as much detail as you can about your hardware set-up, code and steps for reproducing the issue. Make sure you're using an original Arduino board.
 
-### CI
+### Security
 
-This project is built on [GitHub Actions](https://github.com/bcmi-labs/arduino-editor/actions?query=workflow%3A%22Arduino+Pro+IDE%22).
+If you think you found a vulnerability or other security-related bug in this project, please read our
+[security policy](https://github.com/arduino/arduino-ide/security/policy) and report the bug to our Security Team 🛡️
+Thank you!
 
- - _Snapshot_ builds run when changes are pushed to the `master` branch, or when a PR is created against the `master` branch. For the sake of the review and verification process, the build artifacts can be downloaded from the GitHub Actions page. Note: [due to a limitation](https://github.com/actions/upload-artifact/issues/80#issuecomment-630030144) with the GH Actions UI, you cannot download a particular build, but you have to get all together inside the `build-artifacts.zip`.
- - _Nightly_ builds run every day at 03:00 GMT from the `master` branch.
- - _Release_ builds run when a new tag is pushed to the remote. The tag must follow the [semver](https://semver.org/). For instance, `1.2.3` is a correct tag, but `v2.3.4` won't work. Steps to trigger a new release build:
-   - Create a local tag:
-    ```sh
-    git tag -a 1.2.3 -m "Creating a new tag for the `1.2.3` release."
-    ```
-   - Push it to the remote:
-   ```sh
-    git push origin 1.2.3
-   ```
+e-mail contact: security@arduino.cc
 
-### FAQ
+## Contributions and development
 
- - Q: Can I manually change the version of the [`arduino-cli`](https://github.com/arduino/arduino-cli/) used by the IDE?
- - A: Yes. It is possible but not recommended. The CLI exposes a set of functionality via [gRPC](https://github.com/arduino/arduino-cli/tree/master/rpc) and the IDE uses this API to communicate with the CLI. Before we build a new version of IDE, we pin a specific version of CLI and use the corresponding `proto` files to generate TypeScript modules for gRPC. This means, a particular version of IDE is compliant only with the pinned version of CLI. Mismatching IDE and CLI versions might not be able to communicate with each other. This could cause unpredictable IDE behavior.
+Contributions are very welcome! You can browse the list of open issues to see what's needed and then you can submit your code using a Pull Request. Please provide detailed descriptions. We also appreciate any help in testing issues and patches contributed by other users.
 
- - Q: I have understood that not all versions of the CLI is compatible with my version of IDE but how can I manually update the `arduino-cli` inside the IDE?
- - A: [Get](https://arduino.github.io/arduino-cli/installation) the desired version of `arduino-cli` for your platform and manually replace the one inside the IDE. The CLI can be found inside the IDE at:
-   - Windows: `C:\path\to\Arduino Pro IDE\resources\app\node_modules\arduino-ide-extension\build\arduino-cli.exe`,
-   - macOS: `/path/to/Arduino Pro IDE.app/Contents/Resources/app/node_modules/arduino-ide-extension/build/arduino-cli`, and
-   - Linux: `/path/to/Arduino Pro IDE/resources/app/node_modules/arduino-ide-extension/build/arduino-cli`.
+This repository contains the main code, but two more repositories are included during the build process:
 
-### Architecture overview
+* [vscode-arduino-tools](https://github.com/arduino/vscode-arduino-tools): provides support for the language server and the debugger
+* [arduino-language-server](https://github.com/arduino/arduino-language-server): provides the language server that parses Arduino code
 
-The Pro IDE consists of three major parts:
- - the _Electron main_ process,
- - the _backend_, and 
- - the _frontend_.
+See the [BUILDING.md](BUILDING.md) for a technical overview of the application and instructions for building the code.
+## Donations
 
-The _Electron main_ process is responsible for:
- - creating the application,
- - managing the application lifecycle via listeners, and
- - creating and managing the web pages for the app.
+This open source code was written by the Arduino team and is maintained on a daily basis with the help of the community. We invest a considerable amount of time in development, testing and optimization. Please consider [donating](https://www.arduino.cc/en/donate/) or [sponsoring](https://github.com/sponsors/arduino) to support our work, as well as [buying original Arduino boards](https://store.arduino.cc/) which is the best way to make sure our effort can continue in the long term.
 
-In Electron, the process that runs the main entry JavaScript file is called the main process. The _Electron main_ process can display a GUI by creating web pages. An Electron app always has exactly on main process.
+## License
 
-By default, whenever the _Electron main_ process creates a web page, it will instantiate a new `BrowserWindow` instance. Since Electron uses Chromium for displaying web pages, Chromium's multi-process architecture is also used. Each web page in Electron runs in its own process, which is called the renderer process. Each `BrowserWindow` instance runs the web page in its own renderer process. When a `BrowserWindow` instance is destroyed, the corresponding renderer process is also terminated. The main process manages all web pages and their corresponding renderer processes. Each renderer process is isolated and only cares about the web page running in it.<sup>[[1]]</sup>
-
-In normal browsers, web pages usually run in a sandboxed environment, and accessing native resources are disallowed. However, Electron has the power to use Node.js APIs in the web pages allowing lower-level OS interactions. Due to security reasons, accessing native resources is an undesired behavior in the Pro IDE. So by convention, we do not use Node.js APIs. (Note: the Node.js integration is [not yet disabled](https://github.com/eclipse-theia/theia/issues/2018) although it is not used). In the Pro IDE, only the _backend_ allows OS interaction.
-
-The _backend_ process is responsible for:
- - providing access to the filesystem,
- - communicating with the Arduino CLI via gRPC,
- - running your terminal,
- - exposing additional RESTful APIs,
- - performing the Git commands in the local repositories,
- - hosting and running any VS Code extensions, or
- - executing VS Code tasks<sup>[[2]]</sup>.
-
-The _Electron main_ process spawns the _backend_ process. There is always exactly one _backend_ process. However, due to performance considerations, the _backend_ spawns several sub-processes for the filesystem watching, Git repository discovery, etc. The communication between the _backend_ process and its sub-processes is established via IPC. Besides spawning sub-processes, the _backend_ will start an HTTP server on a random available port, and serves the web application as static content. When the sub-processes are up and running, and the HTTP server is also listening, the _backend_ process sends the HTTP server port to the _Electron main_ process via IPC. The _Electron main_ process will load the _backend_'s endpoint in the `BrowserWindow`.
-
-The _frontend_ is running as an Electron renderer process and can invoke services implemented on the _backend_. The communication between the _backend_ and the _frontend_ is done via JSON-RPC over a websocket connection. This means, the services running in the _frontend_ are all proxies, and will ask the corresponding service implementation on the _backend_.
-
-[1]: https://www.electronjs.org/docs/tutorial/application-architecture#differences-between-main-process-and-renderer-process
-[2]: https://code.visualstudio.com/Docs/editor/tasks
+The code contained in this repository and the executable distributions are licensed under the terms of the GNU AGPLv3. The executable distributions contain third-party code licensed under other compatible licenses such as GPLv2, MIT and BSD-3. If you have questions about licensing please contact us at [license@arduino.cc](mailto:license@arduino.cc).

arduino-debugger-extension/package.json

@@ -1,30 +0,0 @@
-{
-  "name": "arduino-debugger-extension",
-  "version": "0.1.3",
-  "description": "An extension for debugging Arduino programs",
-  "license": "MIT",
-  "dependencies": {
-    "@theia/debug": "next",
-    "arduino-ide-extension": "0.1.3",
-    "cdt-gdb-adapter": "^0.0.14",
-    "vscode-debugadapter": "^1.26.0",
-    "vscode-debugprotocol": "^1.26.0"
-  },
-  "scripts": {
-    "prepare": "yarn run clean && yarn run build",
-    "clean": "rimraf lib",
-    "lint": "tslint -c ./tslint.json --project ./tsconfig.json",
-    "build": "tsc && yarn lint",
-    "watch": "tsc -w"
-  },
-  "files": [
-    "lib",
-    "src"
-  ],
-  "theiaExtensions": [
-    {
-      "backend": "lib/node/arduino-debug-backend-module",
-      "frontend": "lib/browser/arduino-debug-frontend-module"
-    }
-  ]
-}

arduino-debugger-extension/src/browser/arduino-debug-configuration-manager.ts

@@ -1,39 +0,0 @@
-import { DebugConfigurationManager } from "@theia/debug/lib/browser/debug-configuration-manager";
-import { injectable } from "inversify";
-
-@injectable()
-export class ArduinoDebugConfigurationManager extends DebugConfigurationManager {
-
-    get defaultDebugger(): Promise<string | undefined> {
-        return this.debug.getDebuggersForLanguage('ino').then(debuggers => {
-            if (debuggers.length === 0)
-                return undefined;
-            return debuggers[0].type;
-        });
-    }
-
-    protected async selectDebugType(): Promise<string | undefined> {
-        const widget = this.editorManager.currentEditor;
-        if (!widget) {
-            return this.defaultDebugger;
-        }
-        const { languageId } = widget.editor.document;
-        const debuggers = await this.debug.getDebuggersForLanguage(languageId);
-        if (debuggers.length === 0) {
-            return this.defaultDebugger;
-        }
-        return this.quickPick.show(debuggers.map(
-            ({ label, type }) => ({ label, value: type }),
-            { placeholder: 'Select Environment' })
-        );
-    }
-
-    async createDefaultConfiguration(): Promise<void> {
-        const { model } = this;
-        if (model) {
-            await this.doCreate(model);
-            await this.updateModels();
-        }
-    }
-
-}

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

@@ -1,133 +0,0 @@
-import { injectable, inject } from 'inversify';
-import { MenuModelRegistry, MessageService, Command, CommandRegistry } from '@theia/core';
-import { KeybindingRegistry } from '@theia/core/lib/browser';
-import { TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import { DebugFrontendApplicationContribution, DebugCommands } from '@theia/debug/lib/browser/debug-frontend-application-contribution';
-import { DebugSessionOptions } from "@theia/debug/lib/browser/debug-session-options";
-import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
-import { FileSystem } from '@theia/filesystem/lib/common';
-import URI from '@theia/core/lib/common/uri';
-import { EditorManager } from '@theia/editor/lib/browser';
-import { EditorMode } from "arduino-ide-extension/lib/browser/editor-mode";
-import { SketchesService } from 'arduino-ide-extension/lib/common/protocol/sketches-service';
-import { ArduinoToolbar } from 'arduino-ide-extension/lib/browser/toolbar/arduino-toolbar';
-import { ArduinoDebugConfigurationManager } from './arduino-debug-configuration-manager';
-
-export namespace ArduinoDebugCommands {
-    export const START_DEBUG: Command = {
-        id: 'arduino-start-debug',
-        label: 'Start Debugging'
-    }
-}
-
-@injectable()
-export class ArduinoDebugFrontendApplicationContribution extends DebugFrontendApplicationContribution {
-
-    @inject(EditorMode)
-    protected readonly editorMode: EditorMode;
-
-    @inject(WorkspaceService)
-    protected readonly workspaceService: WorkspaceService;
-
-    @inject(SketchesService)
-    protected readonly sketchesService: SketchesService;
-
-    @inject(FileSystem)
-    protected readonly fileSystem: FileSystem;
-
-    @inject(EditorManager)
-    protected readonly editorManager: EditorManager;
-
-    @inject(MessageService)
-    protected readonly messageService: MessageService;
-
-    async start(noDebug?: boolean, debugSessionOptions?: DebugSessionOptions): Promise<void> {
-        const configurations = this.configurations as ArduinoDebugConfigurationManager;
-        let current = debugSessionOptions ? debugSessionOptions : configurations.current;
-        // If no configurations are currently present, create them
-        if (!current) {
-            await configurations.createDefaultConfiguration();
-            current = configurations.current;
-        }
-        if (current) {
-            if (noDebug !== undefined) {
-                current = {
-                    ...current,
-                    configuration: {
-                        ...current.configuration,
-                        noDebug
-                    }
-                };
-            }
-            if (current.configuration.type === 'arduino') {
-                const wsStat = this.workspaceService.workspace;
-                let sketchFileURI: URI | undefined;
-                if (wsStat && await this.sketchesService.isSketchFolder(wsStat.resource.toString())) {
-                    const wsPath = wsStat.resource.path;
-                    const sketchFilePath = wsPath.join(wsPath.name + '.ino').toString();
-                    sketchFileURI = new URI(sketchFilePath);
-                } else if (this.editorManager.currentEditor) {
-                    const editorURI = this.editorManager.currentEditor.getResourceUri();
-                    if (editorURI && editorURI.path && editorURI.path.ext === '.ino') {
-                        sketchFileURI = editorURI;
-                    }
-                }
-                if (sketchFileURI) {
-                    await this.editorManager.open(sketchFileURI);
-                    await this.manager.start(current);
-                } else {
-                    this.messageService.error('Please open a sketch file to start debugging.')
-                }
-            } else {
-                await this.manager.start(current);
-            }
-        }
-    }
-
-    initializeLayout(): Promise<void> {
-        if (this.editorMode.proMode) {
-            return super.initializeLayout();
-        }
-        return Promise.resolve();
-    }
-
-    registerMenus(menus: MenuModelRegistry): void {
-        if (this.editorMode.proMode) {
-            super.registerMenus(menus);
-            menus.unregisterMenuAction(DebugCommands.START_NO_DEBUG);
-        }
-    }
-
-    registerKeybindings(keybindings: KeybindingRegistry): void {
-        if (this.editorMode.proMode) {
-            super.registerKeybindings(keybindings);
-            keybindings.unregisterKeybinding({
-                command: DebugCommands.START_NO_DEBUG.id,
-                keybinding: 'ctrl+f5'
-            });
-        }
-    }
-
-    registerToolbarItems(toolbar: TabBarToolbarRegistry): void {
-        super.registerToolbarItems(toolbar);
-        toolbar.registerItem({
-            id: ArduinoDebugCommands.START_DEBUG.id,
-            command: ArduinoDebugCommands.START_DEBUG.id,
-            tooltip: 'Start Debugging',
-            priority: 3
-        });
-    }
-
-    registerCommands(registry: CommandRegistry): void {
-        super.registerCommands(registry);
-        registry.registerCommand(ArduinoDebugCommands.START_DEBUG, {
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
-            isEnabled: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
-            execute: () => {
-                registry.executeCommand(DebugCommands.START.id);
-            }
-        });
-    }
-
-
-}

arduino-debugger-extension/src/browser/arduino-debug-frontend-module.ts

@@ -1,19 +0,0 @@
-import { ContainerModule } from 'inversify';
-import { VariableContribution } from '@theia/variable-resolver/lib/browser';
-import { ArduinoVariableResolver } from './arduino-variable-resolver';
-import { DebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
-import { DebugFrontendApplicationContribution } from '@theia/debug/lib/browser/debug-frontend-application-contribution';
-import { DebugConfigurationManager } from '@theia/debug/lib/browser/debug-configuration-manager';
-import { ArduinoDebugConfigurationManager } from './arduino-debug-configuration-manager';
-import { ArduinoDebugFrontendApplicationContribution } from './arduino-debug-frontend-application-contribution';
-import { ArduinoDebugSessionManager } from './arduino-debug-session-manager';
-
-import '../../src/browser/style/index.css';
-
-export default new ContainerModule((bind, unbind, isBound, rebind) => {
-    bind(ArduinoVariableResolver).toSelf().inSingletonScope();
-    bind(VariableContribution).toService(ArduinoVariableResolver);
-    rebind(DebugSessionManager).to(ArduinoDebugSessionManager).inSingletonScope();
-    rebind(DebugConfigurationManager).to(ArduinoDebugConfigurationManager).inSingletonScope();
-    rebind(DebugFrontendApplicationContribution).to(ArduinoDebugFrontendApplicationContribution);
-});

arduino-debugger-extension/src/browser/arduino-debug-session-manager.ts

@@ -1,14 +0,0 @@
-import { DebugSessionManager } from "@theia/debug/lib/browser/debug-session-manager";
-import { DebugSessionOptions } from "@theia/debug/lib/browser/debug-session-options";
-
-export class ArduinoDebugSessionManager extends DebugSessionManager {
-
-    start(options: DebugSessionOptions) {
-        if (options.configuration.type === 'arduino' && this.sessions.find(s => s.configuration.type === 'arduino')) {
-            this.messageService.info('A debug session is already running. You must stop the running session before starting a new one.')
-            return Promise.resolve(undefined);
-        }
-        return super.start(options);
-    }
-
-}

arduino-debugger-extension/src/browser/arduino-variable-resolver.ts

@@ -1,46 +0,0 @@
-
-import { VariableContribution, VariableRegistry, Variable } from '@theia/variable-resolver/lib/browser';
-import { injectable, inject } from 'inversify';
-import { MessageService } from '@theia/core/lib/common/message-service';
-import { BoardsServiceProvider } from 'arduino-ide-extension/lib/browser/boards/boards-service-provider';
-
-@injectable()
-export class ArduinoVariableResolver implements VariableContribution {
-
-    @inject(BoardsServiceProvider)
-    protected readonly boardsServiceProvider: BoardsServiceProvider;
-
-    @inject(MessageService)
-    protected readonly messageService: MessageService
-
-    registerVariables(variables: VariableRegistry): void {
-        variables.registerVariable(<Variable>{
-            name: 'fqbn',
-            description: 'Qualified name of the selected board',
-            resolve: this.resolveFqbn.bind(this),
-        });
-        variables.registerVariable({
-            name: 'port',
-            description: 'Selected upload port',
-            resolve: this.resolvePort.bind(this)
-        });
-    }
-
-    protected async resolveFqbn(): Promise<string | undefined> {
-        const { boardsConfig } = this.boardsServiceProvider;
-        if (!boardsConfig || !boardsConfig.selectedBoard) {
-            this.messageService.error('No board selected. Please select a board for debugging.');
-            return undefined;
-        }
-        return boardsConfig.selectedBoard.fqbn;
-    }
-
-    protected async resolvePort(): Promise<string | undefined> {
-        const { boardsConfig } = this.boardsServiceProvider;
-        if (!boardsConfig || !boardsConfig.selectedPort) {
-            return undefined;
-        }
-        return boardsConfig.selectedPort.address;
-    }
-
-}

arduino-debugger-extension/src/browser/style/index.css

@@ -1,16 +0,0 @@
-.arduino-start-debug-icon {
-    -webkit-mask: url('debug-dark.svg') 50%;
-    mask: url('debug-dark.svg') 50%;
-    -webkit-mask-size: 100%;
-    mask-size: 100%;
-    -webkit-mask-repeat: no-repeat;
-    mask-repeat: no-repeat;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    color: var(--theia-ui-button-font-color);
-}
-
-.arduino-start-debug {
-    border-radius: 12px;
-}

arduino-debugger-extension/src/node/arduino-debug-adapter-contribution.ts

@@ -1,89 +0,0 @@
-import * as path from 'path';
-import { injectable, inject } from 'inversify';
-import { DebugAdapterContribution, DebugAdapterExecutable } from '@theia/debug/lib/common/debug-model';
-import { DebugConfiguration } from '@theia/debug/lib/common/debug-configuration';
-import { IJSONSchema } from '@theia/core/lib/common/json-schema';
-import { ArduinoDaemonImpl } from 'arduino-ide-extension/lib/node/arduino-daemon-impl';
-
-@injectable()
-export class ArduinoDebugAdapterContribution implements DebugAdapterContribution {
-
-    readonly type = 'arduino';
-    readonly label = 'Arduino';
-    readonly languages = ['c', 'cpp', 'ino'];
-
-    @inject(ArduinoDaemonImpl) daemon: ArduinoDaemonImpl;
-
-    getSchemaAttributes(): IJSONSchema[] {
-        return [
-            {
-                'properties': {
-                    'sketch': {
-                        'type': 'string',
-                        'description': 'path to the sketch root ino file',
-                        'default': '${file}',
-                    },
-                    'pauseAtMain': {
-                        'description': 'If enabled the debugger will pause at the start of the main function.',
-                        'type': 'boolean',
-                        'default': false
-                    },
-                    'debugDebugAdapter': {
-                        'type': 'boolean',
-                        'description': 'Start the debug adapter in debug mode (with --inspect-brk)',
-                        'default': false
-                    },
-                }
-            }
-        ]
-    }
-
-    provideDebugAdapterExecutable(config: DebugConfiguration): DebugAdapterExecutable {
-        const debugAdapterMain = path.join(__dirname, 'debug-adapter', 'main');
-        if (config.debugDebugAdapter) {
-            return {
-                command: process.execPath,
-                args: ['--inspect-brk', debugAdapterMain],
-            }
-        }
-        return {
-            modulePath: debugAdapterMain,
-            args: [],
-        }
-    }
-
-    provideDebugConfigurations(): DebugConfiguration[] {
-        return [
-            <DebugConfiguration>{
-                name: this.label,
-                type: this.type,
-                request: 'launch'
-            }
-        ];
-    }
-
-    async resolveDebugConfiguration(config: DebugConfiguration): Promise<DebugConfiguration> {
-        const startFunction = config.pauseAtMain ? 'main' : 'setup';
-        const res: ActualDebugConfig = {
-            ...config,
-            arduinoCli: await this.daemon.getExecPath(),
-            fqbn: '${fqbn}',
-            uploadPort: '${port}',
-            initCommands: [
-                `-break-insert -t --function ${startFunction}`
-            ]
-        }
-        if (!res.sketch) {
-            res.sketch = '${file}';
-        }
-        return res;
-    }
-
-}
-
-interface ActualDebugConfig extends DebugConfiguration {
-    arduinoCli?: string;
-    sketch?: string;
-    fqbn?: string;
-    uploadPort?: string;
-}

arduino-debugger-extension/src/node/arduino-debug-backend-module.ts

@@ -1,7 +0,0 @@
-import { ContainerModule } from 'inversify';
-import { DebugAdapterContribution } from '@theia/debug/lib/common/debug-model';
-import { ArduinoDebugAdapterContribution } from './arduino-debug-adapter-contribution';
-
-export default new ContainerModule((bind, unbind, isBound, rebind) => {
-    bind(DebugAdapterContribution).to(ArduinoDebugAdapterContribution).inSingletonScope();
-});

arduino-debugger-extension/src/node/debug-adapter/arduino-debug-session.ts

@@ -1,140 +0,0 @@
-import { DebugProtocol } from 'vscode-debugprotocol';
-import { GDBDebugSession, FrameVariableReference } from 'cdt-gdb-adapter/dist/GDBDebugSession';
-import { GDBBackend } from 'cdt-gdb-adapter/dist/GDBBackend';
-import * as mi from 'cdt-gdb-adapter/dist/mi';
-import { ArduinoGDBBackend } from './arduino-gdb-backend';
-import { ArduinoVariableHandler } from './arduino-variable-handler';
-import { Scope, OutputEvent } from 'vscode-debugadapter';
-
-export interface ArduinoLaunchRequestArguments extends DebugProtocol.LaunchRequestArguments {
-    arduinoCli?: string;
-    sketch?: string;
-    fqbn?: string;
-    uploadPort?: string;
-}
-
-const GLOBAL_HANDLE_ID = 0xFE;
-const STATIC_HANDLES_START = 0x010000;
-const STATIC_HANDLES_FINISH = 0x01FFFF;
-
-export class ArduinoDebugSession extends GDBDebugSession {
-
-    private _variableHandler: ArduinoVariableHandler;
-
-    get arduinoBackend(): ArduinoGDBBackend {
-        return this.gdb as ArduinoGDBBackend;
-    }
-
-    protected get variableHandler() {
-        if (this._variableHandler) {
-            return this._variableHandler;
-        }
-        if (!this.gdb) {
-            throw new Error("GDB backend is not ready.");
-        }
-        const handler = new ArduinoVariableHandler(this, this.frameHandles, this.variableHandles);
-        this._variableHandler = handler;
-        return handler;
-    }
-
-    protected createBackend(): GDBBackend {
-        return new ArduinoGDBBackend();
-    }
-
-    protected async configurationDoneRequest(response: DebugProtocol.ConfigurationDoneResponse): Promise<void> {
-        try {
-            await this.gdb.sendCommand('-interpreter-exec console "monitor reset halt"')
-            await mi.sendExecContinue(this.gdb);
-            this.sendResponse(response);
-        } catch (err) {
-            this.sendErrorResponse(response, 100, err.message);
-        }
-    }
-
-    protected pauseRequest(response: DebugProtocol.PauseResponse, args: DebugProtocol.PauseArguments): Promise<void> {
-        if (process.platform === 'win32') {
-            const message = 'Pause is not supported on Windows. Please stop the debug session and set a breakpoint instead.';
-            this.sendEvent(new OutputEvent(message));
-            this.sendErrorResponse(response, 1, message);
-            return Promise.resolve();
-        }
-        return super.pauseRequest(response, args);
-    }
-
-    protected async disconnectRequest(response: DebugProtocol.DisconnectResponse): Promise<void> {
-        try {
-            if (this.isRunning) {
-                if (process.platform === 'win32') {
-                    // We cannot pause on Windows
-                    this.arduinoBackend.kill();
-                    this.sendResponse(response);
-                    return;
-                }
-                // Need to pause first
-                const waitPromise = new Promise(resolve => this.waitPaused = resolve);
-                this.gdb.pause();
-                await waitPromise;
-            }
-            await this.gdb.sendGDBExit();
-            this.sendResponse(response);
-        } catch (err) {
-            this.sendErrorResponse(response, 1, err.message);
-        }
-    }
-
-    protected scopesRequest(response: DebugProtocol.ScopesResponse, args: DebugProtocol.ScopesArguments): void {
-        try {
-            const frame: FrameVariableReference = {
-                type: 'frame',
-                frameHandle: args.frameId,
-            };
-            // const pins: ObjectVariableReference = {
-            //     type: "object",
-            //     varobjName: "__pins",
-            //     frameHandle: 42000,
-            // }
-
-            response.body = {
-                scopes: [
-                    // new Scope('Pins', this.variableHandles.create(pins), false),
-                    new Scope('Local', this.variableHandles.create(frame), false),
-                    new Scope('Global', GLOBAL_HANDLE_ID, false),
-                    // new Scope('Static', STATIC_HANDLES_START + parseInt(args.frameId as any, 10), false)
-                ],
-            };
-
-            this.sendResponse(response);
-        } catch (err) {
-            this.sendErrorResponse(response, 1, err.message);
-        }
-    }
-
-    protected async variablesRequest(response: DebugProtocol.VariablesResponse, args: DebugProtocol.VariablesArguments): Promise<void> {
-        try {
-            response.body = {
-                variables: [] as DebugProtocol.Variable[]
-            };
-            const ref = this.variableHandles.get(args.variablesReference);
-            if (args.variablesReference === GLOBAL_HANDLE_ID) {
-                // Use hardcoded global handle to load and store global variables
-                response.body.variables = await this.variableHandler.getGlobalVariables();
-            } else if (args.variablesReference >= STATIC_HANDLES_START && args.variablesReference <= STATIC_HANDLES_FINISH) {
-                // Use STATIC_HANDLES_START to shift the framehandles back
-                const frameHandle = args.variablesReference - STATIC_HANDLES_START;
-                response.body.variables = await this.variableHandler.getStaticVariables(frameHandle);
-            } else if (ref && ref.type === 'frame') {
-                // List variables for current frame
-                response.body.variables = await this.handleVariableRequestFrame(ref);
-            } else if (ref && ref.varobjName === '__pins') {
-                response.body.variables = await this.variableHandler.handlePinStatusRequest();
-            } else if (ref && ref.type === 'object') {
-                // List data under any variable
-                response.body.variables = await this.handleVariableRequestObject(ref);
-            }
-            this.sendResponse(response);
-        } catch (err) {
-            this.sendErrorResponse(response, 1, err.message);
-        }
-    }
-
-}

arduino-debugger-extension/src/node/debug-adapter/arduino-gdb-backend.ts

@@ -1,73 +0,0 @@
-import * as path from 'path';
-import * as fs from 'arduino-ide-extension/lib/node/fs-extra'
-import { spawn } from 'child_process';
-import { GDBBackend } from 'cdt-gdb-adapter/dist/GDBBackend';
-import { MIFrameInfo } from 'cdt-gdb-adapter/dist/mi';
-import { ArduinoLaunchRequestArguments } from './arduino-debug-session';
-import { ArduinoParser } from './arduino-parser';
-
-export class ArduinoGDBBackend extends GDBBackend {
-
-    constructor() {
-        super();
-        this.parser = new ArduinoParser(this);
-    }
-
-    spawn(requestArgs: ArduinoLaunchRequestArguments): Promise<void> {
-        if (!requestArgs.sketch) {
-            throw new Error('Missing argument: sketch');
-        }
-        if (!requestArgs.fqbn) {
-            throw new Error('Missing argument: fqbn')
-        }
-        const sketchFS = fs.statSync(requestArgs.sketch);
-        const sketchDir = sketchFS.isFile() ? path.dirname(requestArgs.sketch) : requestArgs.sketch;
-        const command = requestArgs.arduinoCli || 'arduino-cli';
-        const args = [
-            'debug',
-            '-p', requestArgs.uploadPort || 'none',
-            '-b', requestArgs.fqbn,
-            '--interpreter', 'mi2',
-            sketchDir
-        ];
-        console.log('Starting debugger:', command, JSON.stringify(args));
-        const proc = spawn(command, args);
-        this.proc = proc;
-        this.out = proc.stdin;
-        return (this.parser as ArduinoParser).parseFull(proc);
-    }
-
-    sendFileExecAndSymbols(): Promise<void> {
-        // The program file is already sent by `arduino-cli`
-        return Promise.resolve();
-    }
-
-    sendExecInterrupt(threadId?: number) {
-        let command = '-exec-interrupt';
-        if (threadId) {
-            command += ` --thread ${threadId}`;
-        }
-        return this.sendCommand(command);
-    }
-
-    sendStackInfoFrame(threadId: number, frameId: number): Promise<{ frame: MIFrameInfo }> {
-        const command = `-stack-info-frame --thread ${threadId} --frame ${frameId}`;
-        return this.sendCommand(command);
-    }
-
-    sendTargetDetach(): Promise<void> {
-        return this.sendCommand('-target-detach');
-    }
-
-    kill(): void {
-        if (!this.proc) {
-            return;
-        }
-        if (process.platform === 'win32') {
-            spawn('taskkill', ['/pid', this.proc.pid.toString(), '/f', '/t']);
-        } else {
-            this.proc.kill('SIGKILL');
-        }
-    }
-
-}

arduino-debugger-extension/src/node/debug-adapter/arduino-parser.ts

@@ -1,76 +0,0 @@
-import { ChildProcessWithoutNullStreams } from 'child_process';
-import { Readable } from 'stream';
-import { MIParser } from "cdt-gdb-adapter/dist/MIParser";
-
-const LINE_REGEX = /(.*)(\r?\n)/;
-
-export class ArduinoParser extends MIParser {
-
-    protected rejectReady?: (error: Error) => void;
-
-    parseFull(proc: ChildProcessWithoutNullStreams): Promise<void> {
-        return new Promise((resolve, reject) => {
-            // Detect errors when the child process could not be spawned
-            proc.on('error', reject);
-
-            this.waitReady = () => {
-                this.rejectReady = undefined;
-                resolve();
-            }
-            this.rejectReady = (error: Error) => {
-                this.waitReady = undefined;
-                reject(error);
-            }
-            // Detect unexpected termination
-            proc.on('exit', () => {
-                if (this.rejectReady) {
-                    this.rejectReady(new Error('The gdb debugger terminated unexpectedly.'));
-                }
-            });
-            this.readInputStream(proc.stdout);
-            this.readErrorStream(proc.stderr);
-        });
-    }
-
-    private readInputStream(stream: Readable) {
-        let buff = '';
-        stream.on('data', chunk => {
-            buff += chunk.toString();
-            let regexArray = LINE_REGEX.exec(buff);
-            while (regexArray) {
-                const line = regexArray[1];
-                this.line = line;
-                this.pos = 0;
-                this.handleLine();
-                // Detect error emitted as log message
-                if (this.rejectReady && line.toLowerCase().startsWith('&"error')) {
-                    this.pos = 1;
-                    this.rejectReady(new Error(this.handleCString() || regexArray[1]));
-                    this.rejectReady = undefined;
-                }
-                buff = buff.substring(regexArray[1].length + regexArray[2].length);
-                regexArray = LINE_REGEX.exec(buff);
-            }
-        });
-    }
-
-    private readErrorStream(stream: Readable) {
-        let buff = '';
-        stream.on('data', chunk => {
-            buff += chunk.toString();
-            let regexArray = LINE_REGEX.exec(buff);
-            while (regexArray) {
-                const line = regexArray[1];
-                this.gdb.emit('consoleStreamOutput', line + '\n', 'stderr');
-                // Detect error emitted on the stderr stream
-                if (this.rejectReady && line.toLowerCase().startsWith('error')) {
-                    this.rejectReady(new Error(line));
-                    this.rejectReady = undefined;
-                }
-                buff = buff.substring(regexArray[1].length + regexArray[2].length);
-                regexArray = LINE_REGEX.exec(buff);
-            }
-        });
-    }
-
-}

arduino-debugger-extension/src/node/debug-adapter/arduino-variable-handler.ts

@@ -1,115 +0,0 @@
-import * as path from 'path';
-import { DebugProtocol } from "vscode-debugprotocol";
-import { Handles } from 'vscode-debugadapter/lib/handles';
-import { FrameReference, VariableReference } from "cdt-gdb-adapter/dist/GDBDebugSession";
-import { VarManager } from 'cdt-gdb-adapter/dist/varManager';
-import * as mi from 'cdt-gdb-adapter/dist/mi';
-import { ArduinoDebugSession } from "./arduino-debug-session";
-import { ArduinoGDBBackend } from './arduino-gdb-backend';
-
-export class ArduinoVariableHandler {
-
-    protected readonly gdb: ArduinoGDBBackend;
-    protected readonly varMgr: VarManager;
-
-    protected globalHandle: number;
-
-    constructor(protected readonly session: ArduinoDebugSession,
-        protected frameHandles: Handles<FrameReference>,
-        protected variableHandles: Handles<VariableReference>) {
-        this.gdb = session.arduinoBackend;
-        this.varMgr = new VarManager(this.gdb);
-    }
-
-    createGlobalHandle() {
-        this.globalHandle = this.frameHandles.create({
-            threadId: -1,
-            frameId: -1
-        });
-    }
-
-    /** TODO */
-    async getGlobalVariables(): Promise<DebugProtocol.Variable[]> {
-        throw new Error('Global variables are not supported yet.');
-        const frame = this.frameHandles.get(this.globalHandle);
-        const symbolInfo: any[] = [] // this.symbolTable.getGlobalVariables();
-        const variables: DebugProtocol.Variable[] = [];
-
-        for (const symbol of symbolInfo) {
-            const name = `global_var_${symbol.name}`;
-            const variable = await this.getVariables(frame, name, symbol.name, -1);
-            variables.push(variable);
-        }
-
-        return variables;
-    }
-
-    /** TODO */
-    async getStaticVariables(frameHandle: number): Promise<DebugProtocol.Variable[]> {
-        throw new Error('Static variables are not supported yet.');
-        const frame = this.frameHandles.get(frameHandle);
-        const result = await this.gdb.sendStackInfoFrame(frame.threadId, frame.frameId);
-        const file = path.normalize(result.frame.file || '');
-        const symbolInfo: any[] = [] // this.symbolTable.getStaticVariables(file);
-        const variables: DebugProtocol.Variable[] = [];
-
-        // Fetch stack depth to obtain frameId/threadId/depth tuple
-        const stackDepth = await mi.sendStackInfoDepth(this.gdb, { maxDepth: 100 });
-        const depth = parseInt(stackDepth.depth, 10);
-
-        for (const symbol of symbolInfo) {
-            const name = `${file}_static_var_${symbol.name}`;
-            const variable = await this.getVariables(frame, name, symbol.name, depth);
-            variables.push(variable);
-        }
-
-        return variables;
-    }
-
-    private async getVariables(frame: FrameReference, name: string, expression: string, depth: number): Promise<DebugProtocol.Variable> {
-        let global = this.varMgr.getVar(frame.frameId, frame.threadId, depth, name);
-
-        if (global) {
-            // Update value if it is already loaded
-            const vup = await mi.sendVarUpdate(this.gdb, { name });
-            const update = vup.changelist[0];
-            if (update && update.in_scope === 'true' && update.name === global.varname) {
-                global.value = update.value;
-            }
-        } else {
-            // create var in GDB and store it in the varMgr
-            const varCreateResponse = await mi.sendVarCreate(this.gdb, {
-                name,
-                frame: 'current',
-                expression,
-            });
-
-            global = this.varMgr.addVar(frame.frameId, frame.threadId, depth, name, true, false, varCreateResponse);
-        }
-
-        return {
-            name: expression,
-            value: (global.value === void 0) ? '<unknown>' : global.value,
-            type: global.type,
-            variablesReference: parseInt(global.numchild, 10) > 0
-                ? this.variableHandles.create({
-                    frameHandle: this.globalHandle,
-                    type: 'object',
-                    varobjName: global.varname,
-                })
-                : 0,
-        };
-    }
-
-    async handlePinStatusRequest(): Promise<DebugProtocol.Variable[]> {
-        const variables: DebugProtocol.Variable[] = [];
-        variables.push({
-            name: "D2",
-            type: "gpio",
-            value: "0x00",
-            variablesReference: 0
-        })
-        return variables;
-    }
-
-}

arduino-debugger-extension/src/node/debug-adapter/main.ts

@@ -1,10 +0,0 @@
-import * as process from 'process';
-import { logger } from 'vscode-debugadapter/lib/logger';
-import { ArduinoDebugSession } from './arduino-debug-session';
-import { DebugSession } from 'vscode-debugadapter';
-
-process.on('uncaughtException', (err: any) => {
-    logger.error(JSON.stringify(err));
-});
-
-DebugSession.run(ArduinoDebugSession);

arduino-debugger-extension/tsconfig.json

@@ -1,31 +0,0 @@
-{
-  "compilerOptions": {
-    "declaration": true,
-    "declarationMap": true,
-    "noImplicitAny": true,
-    "noEmitOnError": true,
-    "noImplicitThis": true,
-    "noUnusedLocals": true,
-    "strictNullChecks": true,
-    "experimentalDecorators": true,
-    "downlevelIteration": true,
-    "emitDecoratorMetadata": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "target": "es6",
-    "outDir": "lib",
-    "lib": [
-      "es6",
-      "dom"
-    ],
-    "jsx": "react",
-    "sourceMap": true,
-    "skipLibCheck": true
-  },
-  "include": [
-    "src"
-  ],
-  "files": [
-    "../node_modules/@theia/monaco/src/typings/monaco/index.d.ts"
-  ]
-}

arduino-debugger-extension/tslint.json

@@ -1,37 +0,0 @@
-{
-  "rules": {
-    "class-name": true,
-    "comment-format": [true, "check-space"],
-    "curly": false,
-    "forin": false,
-    "indent": [true, "spaces"],
-    "max-line-length": [true, 180],
-    "no-trailing-whitespace": false,
-    "no-unused-expression": true,
-    "no-var-keyword": true,
-    "one-line": [true,
-      "check-open-brace",
-      "check-catch",
-      "check-else",
-      "check-whitespace"
-    ],
-    "radix": true,
-    "trailing-comma": [false],
-    "triple-equals": [true, "allow-null-check"],
-    "typedef-whitespace": [true, {
-      "call-signature": "nospace",
-      "index-signature": "nospace",
-      "parameter": "nospace",
-      "property-declaration": "nospace",
-      "variable-declaration": "nospace"
-    }],
-    "variable-name": false,
-    "whitespace": [true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"
-    ]
-  }
-}

arduino-ide-extension/README.md

@@ -1,6 +1,6 @@
 ## Arduino IDE Extension
 
-Arduino Pro IDE is based on Theia, and most of its IDE features, UIs and customizations are implemented in this Theia extension.
+Arduino IDE is based on Theia, and most of its IDE features, UIs and customizations are implemented in this Theia extension.
 
 ### IDE Services
 
@@ -54,3 +54,7 @@ The Config Service knows about your system, like for example the default sketch
 ### `"arduino"` configuration in the `package.json`:
  - `"cli"`:
    - `"version"` type `string` | `{ owner: string, repo: string, commitish?: string }`: if the type is a `string` and is a valid semver, it will get the corresponding [released](https://github.com/arduino/arduino-cli/releases) CLI. If the type is `string` and is a [date in `YYYYMMDD`](https://arduino.github.io/arduino-cli/latest/installation/#nightly-builds) format, it will get a nightly CLI. If the type is an object, a CLI, build from the sources in the `owner/repo` will be used. If `commitish` is not defined, the HEAD of the default branch will be used. In any other cases an error is thrown.
+
+#### Rebuild gRPC protocol interfaces
+  - Some CLI updates can bring changes to the gRPC interfaces, as the API might change. gRPC interfaces can be updated running the command
+    `yarn --cwd arduino-ide-extension generate-protocol`

arduino-ide-extension/data/cli/schema/arduino-cli.schema.json

@@ -1,137 +0,0 @@
-{
-  "$id": "http://arduino.cc/arduino-cli.json",
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "title": "Arduino CLI Configuration",
-  "properties": {
-    "board_manager": {
-      "type": "object",
-      "description": "Board Manager Configuration",
-      "properties": {
-        "additional_urls": {
-          "type": "array",
-          "description": "If your board requires 3rd party core packages to work, you can list the URLs to additional package indexes in the Arduino CLI configuration file.",
-          "items": {
-            "type": "string",
-            "description": "URL pointing to the 3rd party core package index JSON.",
-            "pattern": "^(.*)$"
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    "daemon": {
-      "type": "object",
-      "description": "CLI Daemon Configuration",
-      "properties": {
-        "port": {
-          "type": [
-            "string",
-            "number"
-          ],
-          "description": "The CLI daemon port where the gRPC clients can connect to.",
-          "pattern": "^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$",
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    "directories": {
-      "type": "object",
-      "description": "Directories Configuration",
-      "properties": {
-        "data": {
-          "type": "string",
-          "description": "Path to the the data folder where core packages will be stored.",
-          "pattern": "^(.*)$"
-        },
-        "downloads": {
-          "type": "string",
-          "description": "Path to the staging folder.",
-          "pattern": "^(.*)$"
-        },
-        "user": {
-          "type": "string",
-          "description": "Path to the sketchbooks.",
-          "pattern": "^(.*)$"
-        }
-      },
-      "additionalProperties": false
-    },
-    "logging": {
-      "type": "object",
-      "description": "Logging Configuration",
-      "properties": {
-        "file": {
-          "type": "string",
-          "description": "Path to the file where logs will be written.",
-          "pattern": "^(.*)$"
-        },
-        "format": {
-          "type": "string",
-          "description": "The output format for the logs, can be 'text' or 'json'",
-          "enum": [
-            "text",
-            "json"
-          ]
-        },
-        "level": {
-          "type": "string",
-          "description": "Messages with this level and above will be logged.",
-          "enum": [
-            "trace",
-            "debug",
-            "info",
-            "warning",
-            "error",
-            "fatal",
-            "panic"
-          ]
-        }
-      },
-      "additionalProperties": false
-    },
-    "sketch": {
-      "type": "object",
-      "description": "Sketch Configuration",
-      "properties": {
-        "always_export_binaries": {
-          "type": "boolean",
-          "description": "Controls whether the compiled binaries will be exported into the sketch's 'build' folder or not. 'false' if the binaries are not exported."
-        }
-      },
-      "additionalProperties": false
-    },
-    "telemetry": {
-      "type": "object",
-      "description": "Telemetry Configuration",
-      "properties": {
-        "addr": {
-          "type": "string",
-          "description": "Address to the telemetry endpoint. Must be a full address with host, address, and port. For instance, ':9090' represents 'localhost:9090'",
-          "pattern": "^(.*)$"
-        },
-        "enabled": {
-          "type": "boolean",
-          "description": "Whether the telemetry is enabled or not."
-        },
-        "additionalProperties": false
-      },
-      "additionalProperties": false
-    },
-    "library": {
-      "type": "object",
-      "description": "Library Configuration",
-      "properties": {
-        "enable_unsafe_install": {
-          "type": "boolean",
-          "description": "Set to 'true' to enable the use of the '--git-url' and '--zip-file' flags with 'arduino-cli lib install' These are considered 'unsafe' installation methods because they allow installing files that have not passed through the Library Manager submission process."
-        },
-        "additionalProperties": false
-      },
-      "additionalProperties": false
-    }
-  },
-  "additionalProperties": false
-}

arduino-ide-extension/package.json

@@ -1,8 +1,8 @@
 {
   "name": "arduino-ide-extension",
-  "version": "0.1.3",
+  "version": "2.0.0-beta.9",
   "description": "An extension for Theia building the Arduino IDE",
-  "license": "MIT",
+  "license": "AGPL-3.0-or-later",
   "scripts": {
     "prepare": "yarn download-cli && yarn download-ls && yarn clean && yarn download-examples && yarn build",
     "clean": "rimraf lib",
@@ -10,7 +10,7 @@
     "download-ls": "node ./scripts/download-ls.js",
     "download-examples": "node ./scripts/download-examples.js",
     "generate-protocol": "node ./scripts/generate-protocol.js",
-    "lint": "tslint -c ./tslint.json --project ./tsconfig.json",
+    "lint": "eslint",
     "build": "tsc && ncp ./src/node/cli-protocol/ ./lib/node/cli-protocol/ && yarn lint",
     "watch": "tsc -w",
     "test": "mocha \"./lib/test/**/*.test.js\"",
@@ -23,6 +23,7 @@
     "@theia/editor": "next",
     "@theia/filesystem": "next",
     "@theia/git": "next",
+    "@theia/keymaps": "next",
     "@theia/markers": "next",
     "@theia/monaco": "next",
     "@theia/navigator": "next",
@@ -32,31 +33,49 @@
     "@theia/search-in-workspace": "next",
     "@theia/terminal": "next",
     "@theia/workspace": "next",
+    "@types/atob": "^2.1.2",
+    "@types/auth0-js": "^9.14.0",
+    "@types/btoa": "^1.2.3",
     "@types/dateformat": "^3.0.1",
     "@types/deepmerge": "^2.2.0",
     "@types/glob": "^5.0.35",
     "@types/google-protobuf": "^3.7.2",
     "@types/js-yaml": "^3.12.2",
+    "@types/keytar": "^4.4.0",
     "@types/lodash.debounce": "^4.0.6",
     "@types/ncp": "^2.0.4",
+    "@types/node-fetch": "^2.5.7",
     "@types/ps-tree": "^1.1.0",
     "@types/react-select": "^3.0.0",
+    "@types/react-tabs": "^2.3.2",
     "@types/sinon": "^7.5.2",
     "@types/temp": "^0.8.34",
     "@types/which": "^1.3.1",
     "ajv": "^6.5.3",
+    "async-mutex": "^0.3.0",
+    "atob": "^2.1.2",
+    "auth0-js": "^9.14.0",
+    "btoa": "^1.2.1",
     "css-element-queries": "^1.2.0",
     "dateformat": "^3.0.3",
-    "deepmerge": "^4.2.2",
+    "deepmerge": "2.0.1",
     "fuzzy": "^0.1.3",
     "glob": "^7.1.6",
     "google-protobuf": "^3.11.4",
-    "lodash.debounce": "^4.0.8",
+    "hash.js": "^1.1.7",
+    "is-valid-path": "^0.1.1",
     "js-yaml": "^3.13.1",
+    "jwt-decode": "^3.1.2",
+    "keytar": "7.2.0",
+    "lodash.debounce": "^4.0.8",
     "ncp": "^2.0.0",
+    "node-fetch": "^2.6.1",
+    "open": "^8.0.6",
     "p-queue": "^5.0.0",
     "ps-tree": "^1.2.0",
+    "react-disable": "^0.1.0",
     "react-select": "^3.0.4",
+    "react-tabs": "^3.1.2",
     "semver": "^7.3.2",
     "string-natural-compare": "^2.0.3",
     "temp": "^0.9.1",
@@ -111,16 +130,13 @@
       "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"
-    },
     {
       "electronMain": "lib/electron-main/arduino-electron-main-module"
     }
   ],
   "arduino": {
     "cli": {
-      "version": "0.14.0"
+      "version": "0.18.3"
     }
   }
 }

arduino-ide-extension/scripts/download-examples.js

@@ -1,7 +1,7 @@
 // @ts-check
 
 // The version to use.
-const version = '1.9.0';
+const version = '1.9.1';
 
 (async () => {
 

arduino-ide-extension/scripts/download-ls.js

@@ -6,7 +6,7 @@
 (() => {
 
     const DEFAULT_ALS_VERSION = 'nightly';
-    const DEFAULT_CLANGD_VERSION = '9.0.0';
+    const DEFAULT_CLANGD_VERSION = 'snapshot_20210124';
 
     const path = require('path');
     const shell = require('shelljs');
@@ -22,7 +22,7 @@
         .option('clangd-version', {
             alias: 'cv',
             default: DEFAULT_CLANGD_VERSION,
-            choices: ['8.0.1', '9.0.0'],
+            choices: ['snapshot_20210124'],
             describe: `The version of 'clangd' to download. Defaults to ${DEFAULT_CLANGD_VERSION}.`
         })
         .option('force-download', {
@@ -38,35 +38,35 @@
     const { platform, arch } = process;
 
     const build = path.join(__dirname, '..', 'build');
-    const alsTarget = path.join(build, `arduino-language-server${platform === 'win32' ? '.exe' : ''}`);
+    const lsExecutablePath = path.join(build, `arduino-language-server${platform === 'win32' ? '.exe' : ''}`);
 
-    let clangdTarget, alsSuffix, clangdSuffix;
+    let clangdExecutablePath, lsSuffix, clangdPrefix;
     switch (platform) {
         case 'darwin':
-            clangdTarget = path.join(build, 'bin', 'clangd')
-            alsSuffix = 'Darwin_amd64.zip';
-            clangdSuffix = 'macos.zip';
+            clangdExecutablePath = path.join(build, 'bin', 'clangd')
+            lsSuffix = 'macOS_amd64.zip';
+            clangdPrefix = 'mac';
             break;
         case 'linux':
-            clangdTarget = path.join(build, 'bin', 'clangd')
-            alsSuffix = 'Linux_amd64.zip';
-            clangdSuffix = 'linux.zip'
+            clangdExecutablePath = path.join(build, 'bin', 'clangd')
+            lsSuffix = 'Linux_amd64.zip';
+            clangdPrefix = 'linux'
             break;
         case 'win32':
-            clangdTarget = path.join(build, 'clangd.exe')
-            alsSuffix = 'Windows_NT_amd64.zip';
-            clangdSuffix = 'windows.zip';
+            clangdExecutablePath = path.join(build, 'bin', 'clangd.exe')
+            lsSuffix = 'Windows_amd64.zip';
+            clangdPrefix = 'windows';
             break;
     }
-    if (!alsSuffix) {
+    if (!lsSuffix) {
         shell.echo(`The arduino-language-server is not available for ${platform} ${arch}.`);
         shell.exit(1);
     }
 
-    const alsUrl = `https://downloads.arduino.cc/arduino-language-server/${alsVersion === 'nightly' ? 'nightly/arduino-language-server' : 'arduino-language-server_' + alsVersion}_${alsSuffix}`;
-    downloader.downloadUnzipAll(alsUrl, build, alsTarget, force);
+    const alsUrl = `https://downloads.arduino.cc/arduino-language-server/${alsVersion === 'nightly' ? 'nightly/arduino-language-server' : 'arduino-language-server_' + alsVersion}_${lsSuffix}`;
+    downloader.downloadUnzipAll(alsUrl, build, lsExecutablePath, force);
 
-    const clangdUrl = `https://downloads.arduino.cc/arduino-language-server/clangd/clangd_${clangdVersion}_${clangdSuffix}`;
-    downloader.downloadUnzipAll(clangdUrl, build, clangdTarget, force);
+    const clangdUrl = `https://downloads.arduino.cc/arduino-language-server/clangd/clangd-${clangdPrefix}-${clangdVersion}.zip`;
+    downloader.downloadUnzipAll(clangdUrl, build, clangdExecutablePath, force, { strip: 1 }); // `strip`: the new clangd (12.x) is zipped into a folder, so we have to strip the outmost folder.
 
 })();

arduino-ide-extension/scripts/downloader.js

@@ -79,7 +79,7 @@ exports.downloadUnzipFile = async (url, targetFile, filePrefix, force = false) =
  * @param targetFile {string} Path to the main file expected after decompressing
  * @param force {boolean}     Whether to download even if the target file exists
  */
-exports.downloadUnzipAll = async (url, targetDir, targetFile, force) => {
+exports.downloadUnzipAll = async (url, targetDir, targetFile, force, decompressOptions = undefined) => {
     if (fs.existsSync(targetFile) && !force) {
         shell.echo(`Skipping download because file already exists: ${targetFile}`);
         return;
@@ -96,12 +96,16 @@ exports.downloadUnzipAll = async (url, targetDir, targetFile, force) => {
     shell.echo(`<<< Download succeeded.`);
 
     shell.echo('>>> Decompressing...');
-    const files = await decompress(data, targetDir, {
+    let options = {
         plugins: [
             unzip(),
             untargz()
         ]
-    });
+    };
+    if (decompressOptions) {
+        options = Object.assign(options, decompressOptions)
+    }
+    const files = await decompress(data, targetDir, options);
     if (files.length === 0) {
         shell.echo('Error ocurred while decompressing the archive.');
         shell.exit(1);

arduino-ide-extension/scripts/generate-protocol.js

@@ -66,24 +66,48 @@
     const { platform } = process;
     const build = path.join(__dirname, '..', 'build');
     const cli = path.join(build, `arduino-cli${platform === 'win32' ? '.exe' : ''}`);
-    const jsonVersion = shell.exec(`${cli} version --format json`).trim();
-    if (!jsonVersion) {
+    const versionJson = shell.exec(`${cli} version --format json`).trim();
+    if (!versionJson) {
         shell.echo(`Could not retrieve the CLI version from ${cli}.`);
         shell.exit(1);
     }
-    const version = JSON.parse(jsonVersion).VersionString;
-    if (version) {
-        shell.echo(`>>> Checking out version: ${version}...`);
-        if (shell.exec(`git -C ${repository} checkout ${version} -b ${version}`).code !== 0) {
+    // As of today (28.01.2021), the `VersionString` can be one of the followings:
+    //  - `nightly-YYYYMMDD` stands for the nightly build, we use the , the `commitish` from the `package.json` to check out the code.
+    //  - `0.0.0-git` for local builds, we use the `commitish` from the `package.json` to check out the code and generate the APIs.
+    //  - `git-snapshot` for local build executed via `task build`. We do not do this.
+    //  - rest, we assume it is a valid semver and has the corresponding tagged code, we use the tag to generate the APIs from the `proto` files.
+    /*
+    {
+      "Application": "arduino-cli",
+      "VersionString": "nightly-20210126",
+      "Commit": "079bb6c6",
+      "Status": "alpha",
+      "Date": "2021-01-26T01:46:31Z"
+    }
+    */
+    const versionObject = JSON.parse(versionJson);
+    const version = versionObject.VersionString;
+    if (version && !version.startsWith('nightly-') && version !== '0.0.0-git' && version !== 'git-snapshot') {
+        shell.echo(`>>> Checking out tagged version: '${version}'...`);
+        shell.exec(`git -C ${repository} fetch --all --tags`);
+        if (shell.exec(`git -C ${repository} checkout tags/${version} -b ${version}`).code !== 0) {
             shell.exit(1);
         }
-        shell.echo(`<<< Checked out version: ${commitish}.`);
+        shell.echo(`<<< Checked out tagged version: '${commitish}'.`);
     } else if (commitish) {
-        shell.echo(`>>> Checking out commitish: ${commitish}...`);
+        shell.echo(`>>> Checking out commitish from 'package.json': '${commitish}'...`);
         if (shell.exec(`git -C ${repository} checkout ${commitish}`).code !== 0) {
             shell.exit(1);
         }
-        shell.echo(`<<< Checked out commitish: ${commitish}.`);
+        shell.echo(`<<< Checked out commitish from 'package.json': '${commitish}'.`);
+    } else if (versionObject.Commit) {
+        shell.echo(`>>> Checking out commitish from the CLI: '${versionObject.Commit}'...`);
+        if (shell.exec(`git -C ${repository} checkout ${versionObject.Commit}`).code !== 0) {
+            shell.exit(1);
+        }
+        shell.echo(`<<< Checked out commitish from the CLI: '${versionObject.Commit}'.`);
+    } else {
+        shell.echo(`WARN: no 'git checkout'. Generating from the HEAD revision.`);
     }
 
     shell.echo('>>> Generating TS/JS API from:');

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

@@ -4,27 +4,18 @@ 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 {
-
     export const TOGGLE_COMPILE_FOR_DEBUG: Command = {
-        id: 'arduino-toggle-compile-for-debug'
+        id: 'arduino-toggle-compile-for-debug',
     };
 
     /**
      * 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'
+        id: 'arduino-open-sketch-files',
     };
 
     export const OPEN_BOARDS_DIALOG: Command = {
-        id: 'arduino-open-boards-dialog'
+        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'
-    };
-
 }

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

@@ -1,4 +1,5 @@
-import { MAIN_MENU_BAR, MenuContribution, MenuModelRegistry, SelectionService, ILogger } from '@theia/core';
+import { Mutex } from 'async-mutex';
+import { MAIN_MENU_BAR, MenuContribution, MenuModelRegistry, SelectionService, ILogger, DisposableCollection } from '@theia/core';
 import {
     ContextMenuRenderer,
     FrontendApplication, FrontendApplicationContribution,
@@ -11,7 +12,7 @@ import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/li
 import { CommandContribution, CommandRegistry } from '@theia/core/lib/common/command';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import URI from '@theia/core/lib/common/uri';
-import { EditorMainMenu, EditorManager } from '@theia/editor/lib/browser';
+import { EditorMainMenu, EditorManager, EditorOpenerOptions } from '@theia/editor/lib/browser';
 import { FileDialogService } from '@theia/filesystem/lib/browser/file-dialog';
 import { ProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution';
 import { MonacoMenus } from '@theia/monaco/lib/browser/monaco-menu';
@@ -23,8 +24,9 @@ import { SearchInWorkspaceFrontendContribution } from '@theia/search-in-workspac
 import { TerminalMenus } from '@theia/terminal/lib/browser/terminal-frontend-contribution';
 import { inject, injectable, postConstruct } from 'inversify';
 import * as React from 'react';
+import { remote } from 'electron';
 import { MainMenuManager } from '../common/main-menu-manager';
-import { BoardsService, CoreService, Port, SketchesService, ExecutableService } from '../common/protocol';
+import { BoardsService, CoreService, Port, SketchesService, ExecutableService, Sketch } from '../common/protocol';
 import { ArduinoDaemon } from '../common/protocol/arduino-daemon';
 import { ConfigService } from '../common/protocol/config-service';
 import { FileSystemExt } from '../common/protocol/filesystem-ext';
@@ -42,11 +44,13 @@ import { WorkspaceService } from './theia/workspace/workspace-service';
 import { ArduinoToolbar } from './toolbar/arduino-toolbar';
 import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
-
-const debounce = require('lodash.debounce');
-import { OutputService } from '../common/protocol/output-service';
-import { NotificationCenter } from './notification-center';
-import { Settings } from './contributions/settings';
+import { ResponseService } from '../common/protocol/response-service';
+import { ArduinoPreferences } from './arduino-preferences';
+import { SketchesServiceClientImpl } from '../common/protocol/sketches-service-client-impl';
+import { SaveAsSketch } from './contributions/save-as-sketch';
+import { FileChangeType } from '@theia/filesystem/lib/browser';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import { SketchbookWidgetContribution } from './widgets/sketchbook/sketchbook-widget-contribution';
 
 @injectable()
 export class ArduinoFrontendContribution implements FrontendApplicationContribution,
@@ -80,7 +84,7 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
     protected readonly fileDialogService: FileDialogService;
 
     @inject(FileService)
-    protected readonly fileSystem: FileService;
+    protected readonly fileService: FileService;
 
     @inject(SketchesService)
     protected readonly sketchService: SketchesService;
@@ -121,6 +125,9 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
     @inject(SearchInWorkspaceFrontendContribution)
     protected readonly siwContribution: SearchInWorkspaceFrontendContribution;
 
+    @inject(SketchbookWidgetContribution)
+    protected readonly sketchbookWidgetContribution: SketchbookWidgetContribution;
+
     @inject(EditorMode)
     protected readonly editorMode: EditorMode;
 
@@ -147,13 +154,21 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
 
     @inject(ExecutableService)
     protected executableService: ExecutableService;
-    @inject(OutputService)
-    protected readonly outputService: OutputService;
 
-    @inject(NotificationCenter)
-    protected readonly notificationCenter: NotificationCenter;
+    @inject(ResponseService)
+    protected readonly responseService: ResponseService;
+
+    @inject(ArduinoPreferences)
+    protected readonly arduinoPreferences: ArduinoPreferences;
+
+    @inject(SketchesServiceClientImpl)
+    protected readonly sketchServiceClient: SketchesServiceClientImpl;
+
+    @inject(FrontendApplicationStateService)
+    protected readonly appStateService: FrontendApplicationStateService;
 
     protected invalidConfigPopup: Promise<void | 'No' | 'Yes' | undefined> | undefined;
+    protected toDisposeOnStop = new DisposableCollection();
 
     @postConstruct()
     protected async init(): Promise<void> {
@@ -177,6 +192,23 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
         }
         this.boardsServiceClientImpl.onBoardsConfigChanged(updateStatusBar);
         updateStatusBar(this.boardsServiceClientImpl.boardsConfig);
+        this.appStateService.reachedState('ready').then(async () => {
+            const sketch = await this.sketchServiceClient.currentSketch();
+            if (sketch && (!await this.sketchService.isTemp(sketch))) {
+                this.toDisposeOnStop.push(this.fileService.watch(new URI(sketch.uri)));
+                this.toDisposeOnStop.push(this.fileService.onDidFilesChange(async event => {
+                    for (const { type, resource } of event.changes) {
+                        if (type === FileChangeType.ADDED && resource.parent.toString() === sketch.uri) {
+                            const reloadedSketch = await this.sketchService.loadSketch(sketch.uri)
+                            if (Sketch.isInSketch(resource, reloadedSketch)) {
+                                this.ensureOpened(resource.toString(), true, { mode: 'open' });
+                            }
+                        }
+                    }
+                }));
+            }
+        });
+
     }
 
     onStart(app: FrontendApplication): void {
@@ -187,55 +219,106 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
             this.outlineContribution,
             this.problemContribution,
             this.scmContribution,
-            this.siwContribution] as Array<FrontendApplicationContribution>) {
+            this.siwContribution,
+            this.sketchbookWidgetContribution] as Array<FrontendApplicationContribution>) {
             if (viewContribution.initializeLayout) {
                 viewContribution.initializeLayout(app);
             }
         }
-        this.boardsServiceClientImpl.onBoardsConfigChanged(async ({ selectedBoard }) => {
+        const start = async ({ selectedBoard }: BoardsConfig.Config) => {
             if (selectedBoard) {
                 const { name, fqbn } = selectedBoard;
                 if (fqbn) {
-                    await this.hostedPluginSupport.didStart;
                     this.startLanguageServer(fqbn, name);
                 }
             }
-        });
-        this.notificationCenter.onConfigChanged(({ config }) => {
-            if (config) {
-                this.invalidConfigPopup = undefined;
-            } else {
-                if (!this.invalidConfigPopup) {
-                    this.invalidConfigPopup = this.messageService.error(`Your CLI configuration is invalid. Do you want to correct it now?`, 'No', 'Yes')
-                        .then(answer => {
-                            if (answer === 'Yes') {
-                                this.commandRegistry.executeCommand(Settings.Commands.OPEN_CLI_CONFIG.id)
-                            }
-                            this.invalidConfigPopup = undefined;
-                        });
-                }
+        };
+        this.boardsServiceClientImpl.onBoardsConfigChanged(start);
+        this.arduinoPreferences.onPreferenceChanged(event => {
+            if (event.preferenceName === 'arduino.language.log' && event.newValue !== event.oldValue) {
+                start(this.boardsServiceClientImpl.boardsConfig);
             }
         });
+        this.arduinoPreferences.ready.then(() => {
+            const webContents = remote.getCurrentWebContents();
+            const zoomLevel = this.arduinoPreferences.get('arduino.window.zoomLevel');
+            webContents.setZoomLevel(zoomLevel);
+        });
+        this.arduinoPreferences.onPreferenceChanged(event => {
+            if (event.preferenceName === 'arduino.window.zoomLevel' && typeof event.newValue === 'number' && event.newValue !== event.oldValue) {
+                const webContents = remote.getCurrentWebContents();
+                webContents.setZoomLevel(event.newValue || 0);
+            }
+        });
+        app.shell.leftPanelHandler.removeMenu('settings-menu');
     }
 
-    protected startLanguageServer = debounce((fqbn: string, name: string | undefined) => this.doStartLanguageServer(fqbn, name));
-    protected async doStartLanguageServer(fqbn: string, name: string | undefined): Promise<void> {
-        this.logger.info(`Starting language server: ${fqbn}`);
-        const { clangdUri, cliUri, lsUri } = await this.executableService.list();
-        const [clangdPath, cliPath, lsPath] = await Promise.all([
-            this.fileSystem.fsPath(new URI(clangdUri)),
-            this.fileSystem.fsPath(new URI(cliUri)),
-            this.fileSystem.fsPath(new URI(lsUri)),
-        ]);
-        this.commandRegistry.executeCommand('arduino.languageserver.start', {
-            lsPath,
-            cliPath,
-            clangdPath,
-            board: {
-                fqbn,
-                name: name ? `"${name}"` : undefined
+    onStop(): void {
+        this.toDisposeOnStop.dispose();
+    }
+
+    protected languageServerFqbn?: string;
+    protected languageServerStartMutex = new Mutex();
+    protected async startLanguageServer(fqbn: string, name: string | undefined): Promise<void> {
+        const release = await this.languageServerStartMutex.acquire();
+        try {
+            await this.hostedPluginSupport.didStart;
+            const details = await this.boardsService.getBoardDetails({ fqbn });
+            if (!details) {
+                // Core is not installed for the selected board.
+                console.info(`Could not start language server for ${fqbn}. The core is not installed for the board.`);
+                if (this.languageServerFqbn) {
+                    try {
+                        await this.commandRegistry.executeCommand('arduino.languageserver.stop');
+                        console.info(`Stopped language server process for ${this.languageServerFqbn}.`);
+                        this.languageServerFqbn = undefined;
+                    } catch (e) {
+                        console.error(`Failed to start language server process for ${this.languageServerFqbn}`, e);
+                        throw e;
+                    }
+                }
+                return;
             }
-        });
+            if (fqbn === this.languageServerFqbn) {
+                // NOOP
+                return;
+            }
+            this.logger.info(`Starting language server: ${fqbn}`);
+            const log = this.arduinoPreferences.get('arduino.language.log');
+            let currentSketchPath: string | undefined = undefined;
+            if (log) {
+                const currentSketch = await this.sketchServiceClient.currentSketch();
+                if (currentSketch) {
+                    currentSketchPath = await this.fileService.fsPath(new URI(currentSketch.uri));
+                }
+            }
+            const { clangdUri, cliUri, lsUri } = await this.executableService.list();
+            const [clangdPath, cliPath, lsPath, cliConfigPath] = await Promise.all([
+                this.fileService.fsPath(new URI(clangdUri)),
+                this.fileService.fsPath(new URI(cliUri)),
+                this.fileService.fsPath(new URI(lsUri)),
+                this.fileService.fsPath(new URI(await this.configService.getCliConfigFileUri()))
+            ]);
+            this.languageServerFqbn = await Promise.race([
+                new Promise<undefined>((_, reject) => setTimeout(() => reject(new Error(`Timeout after ${20_000} ms.`)), 20_000)),
+                this.commandRegistry.executeCommand<string>('arduino.languageserver.start', {
+                    lsPath,
+                    cliPath,
+                    clangdPath,
+                    log: currentSketchPath ? currentSketchPath : log,
+                    cliConfigPath,
+                    board: {
+                        fqbn,
+                        name: name ? `"${name}"` : undefined
+                    }
+                })
+            ]);
+        } catch (e) {
+            console.log(`Failed to start language server for ${fqbn}`, e);
+            this.languageServerFqbn = undefined;
+        } finally {
+            release();
+        }
     }
 
     registerToolbarItems(registry: TabBarToolbarRegistry): void {
@@ -253,12 +336,6 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
             command: MonitorViewContribution.TOGGLE_SERIAL_MONITOR_TOOLBAR,
             tooltip: 'Serial Monitor'
         });
-        registry.registerItem({
-            id: ArduinoCommands.TOGGLE_ADVANCED_MODE.id,
-            command: ArduinoCommands.TOGGLE_ADVANCED_MODE_TOOLBAR.id,
-            tooltip: this.editorMode.proMode ? 'Switch to Classic Mode' : 'Switch to Advanced Mode',
-            text: this.editorMode.proMode ? '$(toggle-on)' : '$(toggle-off)'
-        });
     }
 
     registerCommands(registry: CommandRegistry): void {
@@ -279,50 +356,44 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
                 }
             }
         });
-        registry.registerCommand(ArduinoCommands.TOGGLE_ADVANCED_MODE, {
-            isToggled: () => this.editorMode.proMode,
-            execute: () => this.editorMode.toggleProMode()
-        });
-        registry.registerCommand(ArduinoCommands.TOGGLE_ADVANCED_MODE_TOOLBAR, {
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'right',
-            isToggled: () => this.editorMode.proMode,
-            execute: () => this.editorMode.toggleProMode()
-        });
     }
 
     registerMenus(registry: MenuModelRegistry) {
-        if (!this.editorMode.proMode) {
-            const menuId = (menuPath: string[]): string => {
-                const index = menuPath.length - 1;
-                const menuId = menuPath[index];
-                return menuId;
-            }
-            registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(MonacoMenus.SELECTION));
-            registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(EditorMainMenu.GO));
-            registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(TerminalMenus.TERMINAL));
-            registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(CommonMenus.VIEW));
+        const menuId = (menuPath: string[]): string => {
+            const index = menuPath.length - 1;
+            const menuId = menuPath[index];
+            return menuId;
         }
+        registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(MonacoMenus.SELECTION));
+        registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(EditorMainMenu.GO));
+        registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(TerminalMenus.TERMINAL));
+        registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(CommonMenus.VIEW));
+
         registry.registerSubmenu(ArduinoMenus.SKETCH, 'Sketch');
         registry.registerSubmenu(ArduinoMenus.TOOLS, 'Tools');
-        registry.registerMenuAction(ArduinoMenus.SKETCH, {
+        registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
             commandId: ArduinoCommands.TOGGLE_COMPILE_FOR_DEBUG.id,
             label: 'Optimize for Debugging',
-            order: '1'
-        });
-        registry.registerMenuAction(CommonMenus.HELP, {
-            commandId: ArduinoCommands.TOGGLE_ADVANCED_MODE.id,
-            label: 'Advanced Mode'
+            order: '4'
         });
     }
 
     protected async openSketchFiles(uri: URI): Promise<void> {
         try {
             const sketch = await this.sketchService.loadSketch(uri.toString());
-            const { mainFileUri, otherSketchFileUris, additionalFileUris } = sketch;
-            for (const uri of [mainFileUri, ...otherSketchFileUris, ...additionalFileUris]) {
+            const { mainFileUri, rootFolderFileUris } = sketch;
+            for (const uri of [mainFileUri, ...rootFolderFileUris]) {
                 await this.ensureOpened(uri);
             }
             await this.ensureOpened(mainFileUri, true);
+            if (mainFileUri.endsWith('.pde')) {
+                const message = `The '${sketch.name}' still uses the old \`.pde\` format. Do you want to switch to the new \`.ino\` extension?`;
+                this.messageService.info(message, 'Later', 'Yes').then(async answer => {
+                    if (answer === 'Yes') {
+                        this.commandRegistry.executeCommand(SaveAsSketch.Commands.SAVE_AS_SKETCH.id, { execOnlyIfTemp: false, openAfterMove: true, wipeOriginal: false });
+                    }
+                });
+            }
         } catch (e) {
             console.error(e);
             const message = e instanceof Error ? e.message : JSON.stringify(e);
@@ -330,10 +401,10 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
         }
     }
 
-    protected async ensureOpened(uri: string, forceOpen: boolean = false): Promise<any> {
+    protected async ensureOpened(uri: string, forceOpen = false, options?: EditorOpenerOptions | undefined): Promise<any> {
         const widget = this.editorManager.all.find(widget => widget.editor.uri.toString() === uri);
         if (!widget || forceOpen) {
-            return this.editorManager.open(new URI(uri));
+            return this.editorManager.open(new URI(uri), options);
         }
     }
 
@@ -362,7 +433,7 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
                     light: 'editorWidget.background',
                     hc: 'editorWidget.background'
                 },
-                description: 'Color of the Arduino Pro IDE foreground which is used for dialogs, such as the Select Board dialog.'
+                description: 'Color of the Arduino IDE foreground which is used for dialogs, such as the Select Board dialog.'
             },
             {
                 id: 'arduino.toolbar.background',
@@ -377,11 +448,20 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
                 id: 'arduino.toolbar.hoverBackground',
                 defaults: {
                     dark: 'button.hoverBackground',
-                    light: 'button.hoverBackground',
-                    hc: 'activityBar.inactiveForeground'
+                    light: 'button.foreground',
+                    hc: 'textLink.foreground'
                 },
                 description: 'Background color of the toolbar items when hovering over them. Such as Upload, Verify, etc.'
             },
+            {
+                id: 'arduino.toolbar.toggleBackground',
+                defaults: {
+                    dark: 'editor.selectionBackground',
+                    light: 'editor.selectionBackground',
+                    hc: 'textPreformat.foreground'
+                },
+                description: 'Toggle color of the toolbar items when they are currently toggled (the command is in progress)'
+            },
             {
                 id: 'arduino.output.foreground',
                 defaults: {

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

@@ -3,14 +3,29 @@ import { ContainerModule } from 'inversify';
 import { WidgetFactory } from '@theia/core/lib/browser/widget-manager';
 import { CommandContribution } from '@theia/core/lib/common/command';
 import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
-import { TabBarToolbarContribution, TabBarToolbarFactory } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import {
+    TabBarToolbarContribution,
+    TabBarToolbarFactory,
+} from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging/ws-connection-provider';
-import { FrontendApplicationContribution, FrontendApplication as TheiaFrontendApplication } from '@theia/core/lib/browser/frontend-application'
+import {
+    FrontendApplicationContribution,
+    FrontendApplication as TheiaFrontendApplication,
+} from '@theia/core/lib/browser/frontend-application';
 import { LibraryListWidget } from './library/library-list-widget';
 import { ArduinoFrontendContribution } from './arduino-frontend-contribution';
-import { LibraryService, LibraryServicePath } from '../common/protocol/library-service';
-import { BoardsService, BoardsServicePath } from '../common/protocol/boards-service';
-import { SketchesService, SketchesServicePath } from '../common/protocol/sketches-service';
+import {
+    LibraryService,
+    LibraryServicePath,
+} from '../common/protocol/library-service';
+import {
+    BoardsService,
+    BoardsServicePath,
+} from '../common/protocol/boards-service';
+import {
+    SketchesService,
+    SketchesServicePath,
+} from '../common/protocol/sketches-service';
 import { SketchesServiceClientImpl } from '../common/protocol/sketches-service-client-impl';
 import { CoreService, CoreServicePath } from '../common/protocol/core-service';
 import { BoardsListWidget } from './boards/boards-list-widget';
@@ -24,6 +39,8 @@ import { ProblemContribution as TheiaProblemContribution } from '@theia/markers/
 import { ProblemContribution } from './theia/markers/problem-contribution';
 import { FileNavigatorContribution } from './theia/navigator/navigator-contribution';
 import { FileNavigatorContribution as TheiaFileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution';
+import { KeymapsFrontendContribution } from './theia/keymaps/keymaps-frontend-contribution';
+import { KeymapsFrontendContribution as TheiaKeymapsFrontendContribution } from '@theia/keymaps/lib/browser/keymaps-frontend-contribution';
 import { ArduinoToolbarContribution } from './toolbar/arduino-toolbar-contribution';
 import { EditorContribution as TheiaEditorContribution } from '@theia/editor/lib/browser/editor-contribution';
 import { EditorContribution } from './theia/editor/editor-contribution';
@@ -35,12 +52,17 @@ import {
     CommonFrontendContribution as TheiaCommonFrontendContribution,
     KeybindingRegistry as TheiaKeybindingRegistry,
     TabBarRendererFactory,
-    ContextMenuRenderer
+    ContextMenuRenderer,
+    createTreeContainer,
+    TreeWidget,
 } from '@theia/core/lib/browser';
 import { MenuContribution } from '@theia/core/lib/common/menu';
 import { ApplicationShell } from './theia/core/application-shell';
 import { FrontendApplication } from './theia/core/frontend-application';
-import { BoardsConfigDialog, BoardsConfigDialogProps } from './boards/boards-config-dialog';
+import {
+    BoardsConfigDialog,
+    BoardsConfigDialogProps,
+} from './boards/boards-config-dialog';
 import { BoardsConfigDialogWidget } from './boards/boards-config-dialog-widget';
 import { ScmContribution as TheiaScmContribution } from '@theia/scm/lib/browser/scm-contribution';
 import { ScmContribution } from './theia/scm/scm-contribution';
@@ -48,8 +70,15 @@ import { SearchInWorkspaceFrontendContribution as TheiaSearchInWorkspaceFrontend
 import { SearchInWorkspaceFrontendContribution } from './theia/search-in-workspace/search-in-workspace-frontend-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';
-import { ConfigService, ConfigServicePath } from '../common/protocol/config-service';
+import {
+    MonitorServicePath,
+    MonitorService,
+    MonitorServiceClient,
+} from '../common/protocol/monitor-service';
+import {
+    ConfigService,
+    ConfigServicePath,
+} from '../common/protocol/config-service';
 import { MonitorWidget } from './monitor/monitor-widget';
 import { MonitorViewContribution } from './monitor/monitor-view-contribution';
 import { MonitorConnection } from './monitor/monitor-connection';
@@ -64,28 +93,39 @@ import { EditorMode } from './editor-mode';
 import { ListItemRenderer } from './widgets/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 { ArduinoDaemonPath, ArduinoDaemon } from '../common/protocol/arduino-daemon';
-import { EditorManager as TheiaEditorManager, EditorCommandContribution as TheiaEditorCommandContribution } from '@theia/editor/lib/browser';
-import { EditorManager } from './theia/editor/editor-manager';
-import { FrontendConnectionStatusService, ApplicationConnectionStatusContribution } from './theia/core/connection-status-service';
+import {
+    ArduinoDaemonPath,
+    ArduinoDaemon,
+} from '../common/protocol/arduino-daemon';
+import { EditorCommandContribution as TheiaEditorCommandContribution } from '@theia/editor/lib/browser';
+import {
+    FrontendConnectionStatusService,
+    ApplicationConnectionStatusContribution,
+} from './theia/core/connection-status-service';
 import {
     FrontendConnectionStatusService as TheiaFrontendConnectionStatusService,
-    ApplicationConnectionStatusContribution as TheiaApplicationConnectionStatusContribution
+    ApplicationConnectionStatusContribution as TheiaApplicationConnectionStatusContribution,
 } from '@theia/core/lib/browser/connection-status-service';
 import { BoardsDataMenuUpdater } from './boards/boards-data-menu-updater';
 import { BoardsDataStore } from './boards/boards-data-store';
 import { ILogger } from '@theia/core';
-import { FileSystemExt, FileSystemExtPath } from '../common/protocol/filesystem-ext';
+import {
+    FileSystemExt,
+    FileSystemExtPath,
+} from '../common/protocol/filesystem-ext';
 import {
     WorkspaceFrontendContribution as TheiaWorkspaceFrontendContribution,
     FileMenuContribution as TheiaFileMenuContribution,
-    WorkspaceCommandContribution as TheiaWorkspaceCommandContribution
+    WorkspaceCommandContribution as TheiaWorkspaceCommandContribution,
 } from '@theia/workspace/lib/browser';
-import { WorkspaceFrontendContribution, ArduinoFileMenuContribution } from './theia/workspace/workspace-frontend-contribution';
+import {
+    WorkspaceFrontendContribution,
+    ArduinoFileMenuContribution,
+} from './theia/workspace/workspace-frontend-contribution';
 import { Contribution } from './contributions/contribution';
 import { NewSketch } from './contributions/new-sketch';
 import { OpenSketch } from './contributions/open-sketch';
-import { CloseSketch } from './contributions/close-sketch';
+import { Close } from './contributions/close';
 import { SaveAsSketch } from './contributions/save-as-sketch';
 import { SaveSketch } from './contributions/save-sketch';
 import { VerifySketch } from './contributions/verify-sketch';
@@ -108,19 +148,31 @@ import { EditorWidgetFactory } from './theia/editor/editor-widget-factory';
 import { OutputWidget as TheiaOutputWidget } from '@theia/output/lib/browser/output-widget';
 import { OutputWidget } from './theia/output/output-widget';
 import { BurnBootloader } from './contributions/burn-bootloader';
-import { ExamplesServicePath, ExamplesService } from '../common/protocol/examples-service';
+import {
+    ExamplesServicePath,
+    ExamplesService,
+} from '../common/protocol/examples-service';
 import { BuiltInExamples, LibraryExamples } from './contributions/examples';
 import { IncludeLibrary } from './contributions/include-library';
 import { OutputChannelManager as TheiaOutputChannelManager } from '@theia/output/lib/common/output-channel';
 import { OutputChannelManager } from './theia/output/output-channel';
-import { OutputChannelRegistryMainImpl as TheiaOutputChannelRegistryMainImpl, OutputChannelRegistryMainImpl } from './theia/plugin-ext/output-channel-registry-main';
+import {
+    OutputChannelRegistryMainImpl as TheiaOutputChannelRegistryMainImpl,
+    OutputChannelRegistryMainImpl,
+} from './theia/plugin-ext/output-channel-registry-main';
 import { ExecutableService, ExecutableServicePath } from '../common/protocol';
 import { MonacoTextModelService as TheiaMonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
 import { MonacoTextModelService } from './theia/monaco/monaco-text-model-service';
-import { OutputServiceImpl } from './output-service-impl';
-import { OutputServicePath, OutputService } from '../common/protocol/output-service';
+import { ResponseServiceImpl } from './response-service-impl';
+import {
+    ResponseServicePath,
+    ResponseService,
+} from '../common/protocol/response-service';
 import { NotificationCenter } from './notification-center';
-import { NotificationServicePath, NotificationServiceServer } from '../common/protocol';
+import {
+    NotificationServicePath,
+    NotificationServiceServer,
+} from '../common/protocol';
 import { About } from './contributions/about';
 import { IconThemeService } from '@theia/core/lib/browser/icon-theme-service';
 import { TabBarRenderer } from './theia/core/tab-bars';
@@ -130,6 +182,60 @@ import { NavigatorTabBarDecorator } from './theia/navigator/navigator-tab-bar-de
 import { Debug } from './contributions/debug';
 import { DebugSessionManager } from './theia/debug/debug-session-manager';
 import { DebugSessionManager as TheiaDebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
+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';
+import { Help } from './contributions/help';
+import { bindArduinoPreferences } from './arduino-preferences';
+import {
+    SettingsService,
+    SettingsDialog,
+    SettingsWidget,
+    SettingsDialogProps,
+} from './settings';
+import { AddFile } from './contributions/add-file';
+import { ArchiveSketch } from './contributions/archive-sketch';
+import { OutputToolbarContribution as TheiaOutputToolbarContribution } from '@theia/output/lib/browser/output-toolbar-contribution';
+import { OutputToolbarContribution } from './theia/output/output-toolbar-contribution';
+import { AddZipLibrary } from './contributions/add-zip-library';
+import { WorkspaceVariableContribution as TheiaWorkspaceVariableContribution } from '@theia/workspace/lib/browser/workspace-variable-contribution';
+import { WorkspaceVariableContribution } from './theia/workspace/workspace-variable-contribution';
+import { DebugConfigurationManager } from './theia/debug/debug-configuration-manager';
+import { DebugConfigurationManager as TheiaDebugConfigurationManager } from '@theia/debug/lib/browser/debug-configuration-manager';
+import { SearchInWorkspaceWidget as TheiaSearchInWorkspaceWidget } from '@theia/search-in-workspace/lib/browser/search-in-workspace-widget';
+import { SearchInWorkspaceWidget } from './theia/search-in-workspace/search-in-workspace-widget';
+import { SearchInWorkspaceResultTreeWidget as TheiaSearchInWorkspaceResultTreeWidget } from '@theia/search-in-workspace/lib/browser/search-in-workspace-result-tree-widget';
+import { SearchInWorkspaceResultTreeWidget } from './theia/search-in-workspace/search-in-workspace-result-tree-widget';
+import { MonacoEditorProvider } from './theia/monaco/monaco-editor-provider';
+import { MonacoEditorProvider as TheiaMonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
+import { DebugEditorModel } from './theia/debug/debug-editor-model';
+import { DebugEditorModelFactory } from '@theia/debug/lib/browser/editor/debug-editor-model';
+import { StorageWrapper } from './storage-wrapper';
+import { NotificationManager } from './theia/messages/notifications-manager';
+import { NotificationManager as TheiaNotificationManager } from '@theia/messages/lib/browser/notifications-manager';
+import { NotificationsRenderer as TheiaNotificationsRenderer } from '@theia/messages/lib/browser/notifications-renderer';
+import { NotificationsRenderer } from './theia/messages/notifications-renderer';
+import { SketchbookWidgetContribution } from './widgets/sketchbook/sketchbook-widget-contribution';
+import { LocalCacheFsProvider } from './local-cache/local-cache-fs-provider';
+import { CloudSketchbookWidget } from './widgets/cloud-sketchbook/cloud-sketchbook-widget';
+import { CloudSketchbookTreeWidget } from './widgets/cloud-sketchbook/cloud-sketchbook-tree-widget';
+import { createCloudSketchbookTreeWidget } from './widgets/cloud-sketchbook/cloud-sketchbook-tree-container';
+import { CreateApi } from './create/create-api';
+import { ShareSketchDialog } from './dialogs.ts/cloud-share-sketch-dialog';
+import { AuthenticationClientService } from './auth/authentication-client-service';
+import {
+    AuthenticationService,
+    AuthenticationServicePath,
+} from '../common/protocol/authentication-service';
+import { CreateFsProvider } from './create/create-fs-provider';
+import { FileServiceContribution } from '@theia/filesystem/lib/browser/file-service';
+import { CloudSketchbookContribution } from './widgets/cloud-sketchbook/cloud-sketchbook-contributions';
+import { CloudSketchbookCompositeWidget } from './widgets/cloud-sketchbook/cloud-sketchbook-composite-widget';
+import { SketchbookWidget } from './widgets/sketchbook/sketchbook-widget';
+import { SketchbookTreeWidget } from './widgets/sketchbook/sketchbook-tree-widget';
+import { createSketchbookTreeWidget } from './widgets/sketchbook/sketchbook-tree-container';
 
 const ElementQueries = require('css-element-queries/src/ElementQueries');
 
@@ -137,7 +243,7 @@ MonacoThemingService.register({
     id: 'arduino-theme',
     label: 'Light (Arduino)',
     uiTheme: 'vs',
-    json: require('../../src/browser/data/arduino.color-theme.json')
+    json: require('../../src/browser/data/arduino.color-theme.json'),
 });
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
@@ -149,7 +255,9 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(CommandContribution).toService(ArduinoFrontendContribution);
     bind(MenuContribution).toService(ArduinoFrontendContribution);
     bind(TabBarToolbarContribution).toService(ArduinoFrontendContribution);
-    bind(FrontendApplicationContribution).toService(ArduinoFrontendContribution);
+    bind(FrontendApplicationContribution).toService(
+        ArduinoFrontendContribution
+    );
     bind(ColorContribution).toService(ArduinoFrontendContribution);
 
     bind(ArduinoToolbarContribution).toSelf().inSingletonScope();
@@ -159,39 +267,75 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(ListItemRenderer).toSelf().inSingletonScope();
 
     // Library service
-    bind(LibraryService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, LibraryServicePath)).inSingletonScope();
+    bind(LibraryService)
+        .toDynamicValue((context) =>
+            WebSocketConnectionProvider.createProxy(
+                context.container,
+                LibraryServicePath
+            )
+        )
+        .inSingletonScope();
 
     // Library list widget
     bind(LibraryListWidget).toSelf();
     bindViewContribution(bind, LibraryListWidgetFrontendContribution);
-    bind(WidgetFactory).toDynamicValue(context => ({
+    bind(WidgetFactory).toDynamicValue((context) => ({
         id: LibraryListWidget.WIDGET_ID,
-        createWidget: () => context.container.get(LibraryListWidget)
+        createWidget: () => context.container.get(LibraryListWidget),
     }));
-    bind(FrontendApplicationContribution).toService(LibraryListWidgetFrontendContribution);
+    bind(FrontendApplicationContribution).toService(
+        LibraryListWidgetFrontendContribution
+    );
 
     // Sketch list service
-    bind(SketchesService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, SketchesServicePath)).inSingletonScope();
+    bind(SketchesService)
+        .toDynamicValue((context) =>
+            WebSocketConnectionProvider.createProxy(
+                context.container,
+                SketchesServicePath
+            )
+        )
+        .inSingletonScope();
     bind(SketchesServiceClientImpl).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(SketchesServiceClientImpl);
 
     // Config service
-    bind(ConfigService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, ConfigServicePath)).inSingletonScope();
+    bind(ConfigService)
+        .toDynamicValue((context) =>
+            WebSocketConnectionProvider.createProxy(
+                context.container,
+                ConfigServicePath
+            )
+        )
+        .inSingletonScope();
 
     // Boards service
-    bind(BoardsService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, BoardsServicePath)).inSingletonScope();
+    bind(BoardsService)
+        .toDynamicValue((context) =>
+            WebSocketConnectionProvider.createProxy(
+                context.container,
+                BoardsServicePath
+            )
+        )
+        .inSingletonScope();
     // Boards service client to receive and delegate notifications from the backend.
     bind(BoardsServiceProvider).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(BoardsServiceProvider);
 
     // To be able to track, and update the menu based on the core settings (aka. board details) of the currently selected board.
-    bind(FrontendApplicationContribution).to(BoardsDataMenuUpdater).inSingletonScope();
+    bind(FrontendApplicationContribution)
+        .to(BoardsDataMenuUpdater)
+        .inSingletonScope();
     bind(BoardsDataStore).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(BoardsDataStore);
     // Logger for the Arduino daemon
-    bind(ILogger).toDynamicValue(ctx => {
-        const parentLogger = ctx.container.get<ILogger>(ILogger);
-        return parentLogger.child('store');
-    }).inSingletonScope().whenTargetNamed('store');
+    bind(ILogger)
+        .toDynamicValue((ctx) => {
+            const parentLogger = ctx.container.get<ILogger>(ILogger);
+            return parentLogger.child('store');
+        })
+        .inSingletonScope()
+        .whenTargetNamed('store');
 
     // Boards auto-installer
     bind(BoardsAutoInstaller).toSelf().inSingletonScope();
@@ -200,21 +344,30 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     // Boards list widget
     bind(BoardsListWidget).toSelf();
     bindViewContribution(bind, BoardsListWidgetFrontendContribution);
-    bind(WidgetFactory).toDynamicValue(context => ({
+    bind(WidgetFactory).toDynamicValue((context) => ({
         id: BoardsListWidget.WIDGET_ID,
-        createWidget: () => context.container.get(BoardsListWidget)
+        createWidget: () => context.container.get(BoardsListWidget),
     }));
-    bind(FrontendApplicationContribution).toService(BoardsListWidgetFrontendContribution);
+    bind(FrontendApplicationContribution).toService(
+        BoardsListWidgetFrontendContribution
+    );
 
     // Board select dialog
     bind(BoardsConfigDialogWidget).toSelf().inSingletonScope();
     bind(BoardsConfigDialog).toSelf().inSingletonScope();
     bind(BoardsConfigDialogProps).toConstantValue({
-        title: 'Select Board'
-    })
+        title: 'Select Board',
+    });
 
     // Core service
-    bind(CoreService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, CoreServicePath)).inSingletonScope();
+    bind(CoreService)
+        .toDynamicValue((context) =>
+            WebSocketConnectionProvider.createProxy(
+                context.container,
+                CoreServicePath
+            )
+        )
+        .inSingletonScope();
 
     // Serial monitor
     bind(MonitorModel).toSelf().inSingletonScope();
@@ -222,73 +375,130 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(MonitorWidget).toSelf();
     bindViewContribution(bind, MonitorViewContribution);
     bind(TabBarToolbarContribution).toService(MonitorViewContribution);
-    bind(WidgetFactory).toDynamicValue(context => ({
+    bind(WidgetFactory).toDynamicValue((context) => ({
         id: MonitorWidget.ID,
-        createWidget: () => context.container.get(MonitorWidget)
+        createWidget: () => context.container.get(MonitorWidget),
     }));
     // Frontend binding for the serial monitor service
-    bind(MonitorService).toDynamicValue(context => {
-        const connection = context.container.get(WebSocketConnectionProvider);
-        const client = context.container.get(MonitorServiceClientImpl);
-        return connection.createProxy(MonitorServicePath, client);
-    }).inSingletonScope();
+    bind(MonitorService)
+        .toDynamicValue((context) => {
+            const connection = context.container.get(
+                WebSocketConnectionProvider
+            );
+            const client = context.container.get(MonitorServiceClientImpl);
+            return connection.createProxy(MonitorServicePath, client);
+        })
+        .inSingletonScope();
     bind(MonitorConnection).toSelf().inSingletonScope();
     // Serial monitor service client to receive and delegate notifications from the backend.
     bind(MonitorServiceClientImpl).toSelf().inSingletonScope();
-    bind(MonitorServiceClient).toDynamicValue(context => {
-        const client = context.container.get(MonitorServiceClientImpl);
-        WebSocketConnectionProvider.createProxy(context.container, MonitorServicePath, client);
-        return client;
-    }).inSingletonScope();
+    bind(MonitorServiceClient)
+        .toDynamicValue((context) => {
+            const client = context.container.get(MonitorServiceClientImpl);
+            WebSocketConnectionProvider.createProxy(
+                context.container,
+                MonitorServicePath,
+                client
+            );
+            return client;
+        })
+        .inSingletonScope();
 
     bind(WorkspaceService).toSelf().inSingletonScope();
     rebind(TheiaWorkspaceService).toService(WorkspaceService);
+    bind(WorkspaceVariableContribution).toSelf().inSingletonScope();
+    rebind(TheiaWorkspaceVariableContribution).toService(
+        WorkspaceVariableContribution
+    );
 
     // Customizing default Theia layout based on the editor mode: `pro-mode` or `classic`.
     bind(EditorMode).toSelf().inSingletonScope();
     bind(FrontendApplicationContribution).toService(EditorMode);
 
     // Layout and shell customizations.
-    rebind(TheiaOutlineViewContribution).to(OutlineViewContribution).inSingletonScope();
+    rebind(TheiaOutlineViewContribution)
+        .to(OutlineViewContribution)
+        .inSingletonScope();
     rebind(TheiaProblemContribution).to(ProblemContribution).inSingletonScope();
-    rebind(TheiaFileNavigatorContribution).to(FileNavigatorContribution).inSingletonScope();
+    rebind(TheiaFileNavigatorContribution)
+        .to(FileNavigatorContribution)
+        .inSingletonScope();
+    rebind(TheiaKeymapsFrontendContribution)
+        .to(KeymapsFrontendContribution)
+        .inSingletonScope();
     rebind(TheiaEditorContribution).to(EditorContribution).inSingletonScope();
-    rebind(TheiaMonacoStatusBarContribution).to(MonacoStatusBarContribution).inSingletonScope();
+    rebind(TheiaMonacoStatusBarContribution)
+        .to(MonacoStatusBarContribution)
+        .inSingletonScope();
     rebind(TheiaApplicationShell).to(ApplicationShell).inSingletonScope();
     rebind(TheiaScmContribution).to(ScmContribution).inSingletonScope();
-    rebind(TheiaSearchInWorkspaceFrontendContribution).to(SearchInWorkspaceFrontendContribution).inSingletonScope();
+    rebind(TheiaSearchInWorkspaceFrontendContribution)
+        .to(SearchInWorkspaceFrontendContribution)
+        .inSingletonScope();
     rebind(TheiaFrontendApplication).to(FrontendApplication).inSingletonScope();
-    rebind(TheiaWorkspaceFrontendContribution).to(WorkspaceFrontendContribution).inSingletonScope();
-    rebind(TheiaFileMenuContribution).to(ArduinoFileMenuContribution).inSingletonScope();
-    rebind(TheiaCommonFrontendContribution).to(CommonFrontendContribution).inSingletonScope();
-    rebind(TheiaPreferencesContribution).to(PreferencesContribution).inSingletonScope();
+    rebind(TheiaWorkspaceFrontendContribution)
+        .to(WorkspaceFrontendContribution)
+        .inSingletonScope();
+    rebind(TheiaFileMenuContribution)
+        .to(ArduinoFileMenuContribution)
+        .inSingletonScope();
+    rebind(TheiaCommonFrontendContribution)
+        .to(CommonFrontendContribution)
+        .inSingletonScope();
+    rebind(TheiaPreferencesContribution)
+        .to(PreferencesContribution)
+        .inSingletonScope();
     rebind(TheiaKeybindingRegistry).to(KeybindingRegistry).inSingletonScope();
-    rebind(TheiaWorkspaceCommandContribution).to(WorkspaceCommandContribution).inSingletonScope();
-    rebind(TheiaWorkspaceDeleteHandler).to(WorkspaceDeleteHandler).inSingletonScope();
+    rebind(TheiaWorkspaceCommandContribution)
+        .to(WorkspaceCommandContribution)
+        .inSingletonScope();
+    rebind(TheiaWorkspaceDeleteHandler)
+        .to(WorkspaceDeleteHandler)
+        .inSingletonScope();
     rebind(TheiaEditorWidgetFactory).to(EditorWidgetFactory).inSingletonScope();
-    rebind(TabBarToolbarFactory).toFactory(({ container: parentContainer }) => () => {
-        const container = parentContainer.createChild();
-        container.bind(TabBarToolbar).toSelf().inSingletonScope();
-        return container.get(TabBarToolbar);
-    });
+    rebind(TabBarToolbarFactory).toFactory(
+        ({ container: parentContainer }) =>
+            () => {
+                const container = parentContainer.createChild();
+                container.bind(TabBarToolbar).toSelf().inSingletonScope();
+                return container.get(TabBarToolbar);
+            }
+    );
     bind(OutputWidget).toSelf().inSingletonScope();
     rebind(TheiaOutputWidget).toService(OutputWidget);
     bind(OutputChannelManager).toSelf().inSingletonScope();
     rebind(TheiaOutputChannelManager).toService(OutputChannelManager);
     bind(OutputChannelRegistryMainImpl).toSelf().inTransientScope();
-    rebind(TheiaOutputChannelRegistryMainImpl).toService(OutputChannelRegistryMainImpl);
+    rebind(TheiaOutputChannelRegistryMainImpl).toService(
+        OutputChannelRegistryMainImpl
+    );
     bind(MonacoTextModelService).toSelf().inSingletonScope();
     rebind(TheiaMonacoTextModelService).toService(MonacoTextModelService);
+    bind(MonacoEditorProvider).toSelf().inSingletonScope();
+    rebind(TheiaMonacoEditorProvider).toService(MonacoEditorProvider);
+
+    bind(SearchInWorkspaceWidget).toSelf();
+    rebind(TheiaSearchInWorkspaceWidget).toService(SearchInWorkspaceWidget);
+    rebind(TheiaSearchInWorkspaceResultTreeWidget).toDynamicValue(
+        ({ container }) => {
+            const childContainer = createTreeContainer(container);
+            childContainer.bind(SearchInWorkspaceResultTreeWidget).toSelf();
+            childContainer
+                .rebind(TreeWidget)
+                .toService(SearchInWorkspaceResultTreeWidget);
+            return childContainer.get(SearchInWorkspaceResultTreeWidget);
+        }
+    );
 
     // Show a disconnected status bar, when the daemon is not available
     bind(ApplicationConnectionStatusContribution).toSelf().inSingletonScope();
-    rebind(TheiaApplicationConnectionStatusContribution).toService(ApplicationConnectionStatusContribution);
+    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(EditorManager).toSelf().inSingletonScope();
-    rebind(TheiaEditorManager).toService(EditorManager);
+    rebind(TheiaFrontendConnectionStatusService).toService(
+        FrontendConnectionStatusService
+    );
 
     // Decorator customizations
     bind(TabBarDecoratorService).toSelf().inSingletonScope();
@@ -302,20 +512,52 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(ShellLayoutRestorer).toSelf().inSingletonScope();
     rebind(TheiaShellLayoutRestorer).toService(ShellLayoutRestorer);
 
-    bind(ArduinoDaemon).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, ArduinoDaemonPath)).inSingletonScope();
+    // No dropdown for the _Output_ view.
+    bind(OutputToolbarContribution).toSelf().inSingletonScope();
+    rebind(TheiaOutputToolbarContribution).toService(OutputToolbarContribution);
+
+    bind(ArduinoDaemon)
+        .toDynamicValue((context) =>
+            WebSocketConnectionProvider.createProxy(
+                context.container,
+                ArduinoDaemonPath
+            )
+        )
+        .inSingletonScope();
 
     // File-system extension
-    bind(FileSystemExt).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, FileSystemExtPath)).inSingletonScope();
+    bind(FileSystemExt)
+        .toDynamicValue((context) =>
+            WebSocketConnectionProvider.createProxy(
+                context.container,
+                FileSystemExtPath
+            )
+        )
+        .inSingletonScope();
 
     // Examples service@
-    bind(ExamplesService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, ExamplesServicePath)).inSingletonScope();
+    bind(ExamplesService)
+        .toDynamicValue((context) =>
+            WebSocketConnectionProvider.createProxy(
+                context.container,
+                ExamplesServicePath
+            )
+        )
+        .inSingletonScope();
 
     // Executable URIs known by the backend
-    bind(ExecutableService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, ExecutableServicePath)).inSingletonScope();
+    bind(ExecutableService)
+        .toDynamicValue((context) =>
+            WebSocketConnectionProvider.createProxy(
+                context.container,
+                ExecutableServicePath
+            )
+        )
+        .inSingletonScope();
 
     Contribution.configure(bind, NewSketch);
     Contribution.configure(bind, OpenSketch);
-    Contribution.configure(bind, CloseSketch);
+    Contribution.configure(bind, Close);
     Contribution.configure(bind, SaveSketch);
     Contribution.configure(bind, SaveAsSketch);
     Contribution.configure(bind, VerifySketch);
@@ -331,22 +573,52 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     Contribution.configure(bind, IncludeLibrary);
     Contribution.configure(bind, About);
     Contribution.configure(bind, Debug);
+    Contribution.configure(bind, Sketchbook);
+    Contribution.configure(bind, BoardSelection);
+    Contribution.configure(bind, OpenRecentSketch);
+    Contribution.configure(bind, Help);
+    Contribution.configure(bind, AddFile);
+    Contribution.configure(bind, ArchiveSketch);
+    Contribution.configure(bind, AddZipLibrary);
 
-    bind(OutputServiceImpl).toSelf().inSingletonScope().onActivation(({ container }, outputService) => {
-        WebSocketConnectionProvider.createProxy(container, OutputServicePath, outputService);
-        return outputService;
-    });
-    bind(OutputService).toService(OutputServiceImpl);
+    bind(ResponseServiceImpl)
+        .toSelf()
+        .inSingletonScope()
+        .onActivation(({ container }, responseService) => {
+            WebSocketConnectionProvider.createProxy(
+                container,
+                ResponseServicePath,
+                responseService
+            );
+            return responseService;
+        });
+    bind(ResponseService).toService(ResponseServiceImpl);
 
     bind(NotificationCenter).toSelf().inSingletonScope();
-    bind(NotificationServiceServer).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, NotificationServicePath)).inSingletonScope();
+    bind(FrontendApplicationContribution).toService(NotificationCenter);
+    bind(NotificationServiceServer)
+        .toDynamicValue((context) =>
+            WebSocketConnectionProvider.createProxy(
+                context.container,
+                NotificationServicePath
+            )
+        )
+        .inSingletonScope();
 
     // Enable the dirty indicator on uncloseable widgets.
-    rebind(TabBarRendererFactory).toFactory(context => () => {
-        const contextMenuRenderer = context.container.get<ContextMenuRenderer>(ContextMenuRenderer);
-        const decoratorService = context.container.get<TabBarDecoratorService>(TabBarDecoratorService);
-        const iconThemeService = context.container.get<IconThemeService>(IconThemeService);
-        return new TabBarRenderer(contextMenuRenderer, decoratorService, iconThemeService);
+    rebind(TabBarRendererFactory).toFactory((context) => () => {
+        const contextMenuRenderer =
+            context.container.get<ContextMenuRenderer>(ContextMenuRenderer);
+        const decoratorService = context.container.get<TabBarDecoratorService>(
+            TabBarDecoratorService
+        );
+        const iconThemeService =
+            context.container.get<IconThemeService>(IconThemeService);
+        return new TabBarRenderer(
+            contextMenuRenderer,
+            decoratorService,
+            iconThemeService
+        );
     });
 
     // Workaround for https://github.com/eclipse-theia/theia/issues/8722
@@ -361,4 +633,90 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     // To avoid running `Save All` when there are no dirty editors before starting the debug session.
     bind(DebugSessionManager).toSelf().inSingletonScope();
     rebind(TheiaDebugSessionManager).toService(DebugSessionManager);
+    // To remove the `Run` menu item from the application menu.
+    bind(DebugFrontendApplicationContribution).toSelf().inSingletonScope();
+    rebind(TheiaDebugFrontendApplicationContribution).toService(
+        DebugFrontendApplicationContribution
+    );
+    // To be able to use a `launch.json` from outside of the workspace.
+    bind(DebugConfigurationManager).toSelf().inSingletonScope();
+    rebind(TheiaDebugConfigurationManager).toService(DebugConfigurationManager);
+
+    // Patch for the debug hover: https://github.com/eclipse-theia/theia/pull/9256/
+    rebind(DebugEditorModelFactory)
+        .toDynamicValue(
+            ({ container }) =>
+                <DebugEditorModelFactory>(
+                    ((editor) =>
+                        DebugEditorModel.createModel(container, editor))
+                )
+        )
+        .inSingletonScope();
+
+    // Preferences
+    bindArduinoPreferences(bind);
+
+    // Settings wrapper for the preferences and the CLI config.
+    bind(SettingsService).toSelf().inSingletonScope();
+    // Settings dialog and widget
+    bind(SettingsWidget).toSelf().inSingletonScope();
+    bind(SettingsDialog).toSelf().inSingletonScope();
+    bind(SettingsDialogProps).toConstantValue({
+        title: 'Preferences',
+    });
+
+    bind(StorageWrapper).toSelf().inSingletonScope();
+    bind(CommandContribution).toService(StorageWrapper);
+
+    bind(NotificationManager).toSelf().inSingletonScope();
+    rebind(TheiaNotificationManager).toService(NotificationManager);
+    bind(NotificationsRenderer).toSelf().inSingletonScope();
+    rebind(TheiaNotificationsRenderer).toService(NotificationsRenderer);
+
+    // UI for the Sketchbook
+    bind(SketchbookWidget).toSelf();
+    bind(SketchbookTreeWidget).toDynamicValue(({ container }) =>
+        createSketchbookTreeWidget(container)
+    );
+    bindViewContribution(bind, SketchbookWidgetContribution);
+    bind(FrontendApplicationContribution).toService(
+        SketchbookWidgetContribution
+    );
+    bind(WidgetFactory).toDynamicValue(({ container }) => ({
+        id: 'arduino-sketchbook-widget',
+        createWidget: () => container.get(SketchbookWidget),
+    }));
+
+    bind(CloudSketchbookWidget).toSelf();
+    rebind(SketchbookWidget).toService(CloudSketchbookWidget);
+    bind(CloudSketchbookTreeWidget).toDynamicValue(({ container }) =>
+        createCloudSketchbookTreeWidget(container)
+    );
+    bind(CreateApi).toSelf().inSingletonScope();
+    bind(ShareSketchDialog).toSelf().inSingletonScope();
+    bind(AuthenticationClientService).toSelf().inSingletonScope();
+    bind(CommandContribution).toService(AuthenticationClientService);
+    bind(FrontendApplicationContribution).toService(
+        AuthenticationClientService
+    );
+    bind(AuthenticationService)
+        .toDynamicValue((context) =>
+            WebSocketConnectionProvider.createProxy(
+                context.container,
+                AuthenticationServicePath
+            )
+        )
+        .inSingletonScope();
+    bind(CreateFsProvider).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(CreateFsProvider);
+    bind(FileServiceContribution).toService(CreateFsProvider);
+    bind(CloudSketchbookContribution).toSelf().inSingletonScope();
+    bind(CommandContribution).toService(CloudSketchbookContribution);
+    bind(LocalCacheFsProvider).toSelf().inSingletonScope();
+    bind(FileServiceContribution).toService(LocalCacheFsProvider);
+    bind(CloudSketchbookCompositeWidget).toSelf();
+    bind<WidgetFactory>(WidgetFactory).toDynamicValue((ctx) => ({
+        id: 'cloud-sketchbook-composite-widget',
+        createWidget: () => ctx.container.get(CloudSketchbookCompositeWidget),
+    }));
 });

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

@@ -0,0 +1,156 @@
+import { interfaces } from 'inversify';
+import {
+    createPreferenceProxy,
+    PreferenceProxy,
+    PreferenceService,
+    PreferenceContribution,
+    PreferenceSchema,
+} from '@theia/core/lib/browser/preferences';
+import { CompilerWarningLiterals, CompilerWarnings } from '../common/protocol';
+
+export const ArduinoConfigSchema: PreferenceSchema = {
+    type: 'object',
+    properties: {
+        'arduino.language.log': {
+            type: 'boolean',
+            description:
+                "True if the Arduino Language Server should generate log files into the sketch folder. Otherwise, false. It's false by default.",
+            default: false,
+        },
+        'arduino.compile.verbose': {
+            type: 'boolean',
+            description: 'True for verbose compile output. False by default',
+            default: false,
+        },
+        'arduino.compile.warnings': {
+            enum: [...CompilerWarningLiterals],
+            description:
+                "Tells gcc which warning level to use. It's 'None' by default",
+            default: 'None',
+        },
+        'arduino.upload.verbose': {
+            type: 'boolean',
+            description: 'True for verbose upload output. False by default.',
+            default: false,
+        },
+        'arduino.upload.verify': {
+            type: 'boolean',
+            default: false,
+        },
+        'arduino.window.autoScale': {
+            type: 'boolean',
+            description:
+                'True if the user interface automatically scales with the font size.',
+            default: true,
+        },
+        'arduino.window.zoomLevel': {
+            type: 'number',
+            description:
+                'Adjust the zoom level of the window. The original size is 0 and each increment above (e.g. 1) or below (e.g. -1) represents zooming 20% larger or smaller. You can also enter decimals to adjust the zoom level with a finer granularity.',
+            default: 0,
+        },
+        'arduino.ide.autoUpdate': {
+            type: 'boolean',
+            description:
+                'True to enable automatic update checks. The IDE will check for updates automatically and periodically.',
+            default: true,
+        },
+        'arduino.sketchbook.showAllFiles': {
+            type: 'boolean',
+            description:
+                'True to show all sketch files inside the sketch. It is false by default.',
+            default: false,
+        },
+        'arduino.cloud.enabled': {
+            type: 'boolean',
+            description:
+                'True if the sketch sync functions are enabled. Defaults to true.',
+            default: true,
+        },
+        'arduino.cloud.pull.warn': {
+            type: 'boolean',
+            description:
+                'True if users should be warned before pulling a cloud sketch. Defaults to true.',
+            default: true,
+        },
+        'arduino.cloud.push.warn': {
+            type: 'boolean',
+            description:
+                'True if users should be warned before pushing a cloud sketch. Defaults to true.',
+            default: true,
+        },
+        'arduino.cloud.pushpublic.warn': {
+            type: 'boolean',
+            description:
+                'True if users should be warned before pushing a public sketch to the cloud. Defaults to true.',
+            default: true,
+        },
+        'arduino.cloud.sketchSyncEnpoint': {
+            type: 'string',
+            description:
+                'The endpoint used to push and pull sketches from a backend. By default it points to Arduino Cloud API.',
+            default: 'https://api2.arduino.cc/create',
+        },
+        'arduino.auth.clientID': {
+            type: 'string',
+            description: 'The OAuth2 client ID.',
+            default: 'C34Ya6ex77jTNxyKWj01lCe1vAHIaPIo',
+        },
+        'arduino.auth.domain': {
+            type: 'string',
+            description: 'The OAuth2 domain.',
+            default: 'login.arduino.cc',
+        },
+        'arduino.auth.audience': {
+            type: 'string',
+            description: 'The 0Auth2 audience.',
+            default: 'https://api.arduino.cc',
+        },
+        'arduino.auth.registerUri': {
+            type: 'string',
+            description: 'The URI used to register a new user.',
+            default: 'https://auth.arduino.cc/login#/register',
+        },
+    },
+};
+
+export interface ArduinoConfiguration {
+    'arduino.language.log': boolean;
+    'arduino.compile.verbose': boolean;
+    'arduino.compile.warnings': CompilerWarnings;
+    'arduino.upload.verbose': boolean;
+    'arduino.upload.verify': boolean;
+    'arduino.window.autoScale': boolean;
+    'arduino.window.zoomLevel': number;
+    'arduino.ide.autoUpdate': boolean;
+    'arduino.sketchbook.showAllFiles': boolean;
+    'arduino.cloud.enabled': boolean;
+    'arduino.cloud.pull.warn': boolean;
+    'arduino.cloud.push.warn': boolean;
+    'arduino.cloud.pushpublic.warn': boolean;
+    'arduino.cloud.sketchSyncEnpoint': string;
+    'arduino.auth.clientID': string;
+    'arduino.auth.domain': string;
+    'arduino.auth.audience': string;
+    'arduino.auth.registerUri': string;
+}
+
+export const ArduinoPreferences = Symbol('ArduinoPreferences');
+export type ArduinoPreferences = PreferenceProxy<ArduinoConfiguration>;
+
+export function createArduinoPreferences(
+    preferences: PreferenceService
+): ArduinoPreferences {
+    return createPreferenceProxy(preferences, ArduinoConfigSchema);
+}
+
+export function bindArduinoPreferences(bind: interfaces.Bind): void {
+    bind(ArduinoPreferences).toDynamicValue((ctx) => {
+        const preferences =
+            ctx.container.get<PreferenceService>(PreferenceService);
+        return createArduinoPreferences(preferences);
+    });
+    bind(PreferenceContribution).toConstantValue({
+        schema: ArduinoConfigSchema,
+    });
+}

arduino-ide-extension/src/browser/arduino-workspace-resolver.ts

@@ -7,7 +7,7 @@ import { MaybePromise } from '@theia/core/lib/common/types';
 /**
  * Class for determining the default workspace location from the
  * `location.hash`, the historical workspace locations, and recent sketch files.
- * 
+ *
  * The following logic is used for determining the default workspace location:
  * - `hash` points to an existing location?
  *  - Yes
@@ -24,20 +24,24 @@ namespace ArduinoWorkspaceRootResolver {
         readonly isValid: (uri: string) => MaybePromise<boolean>;
     }
     export interface ResolveOptions {
-        readonly hash?: string
+        readonly hash?: string;
         readonly recentWorkspaces: string[];
         // Gathered from the default sketch folder. The default sketch folder is defined by the CLI.
         readonly recentSketches: string[];
     }
 }
 export class ArduinoWorkspaceRootResolver {
+    constructor(protected options: ArduinoWorkspaceRootResolver.InitOptions) {}
 
-    constructor(protected options: ArduinoWorkspaceRootResolver.InitOptions) {
-    }
-
-    async resolve(options: ArduinoWorkspaceRootResolver.ResolveOptions): Promise<{ uri: string } | undefined> {
+    async resolve(
+        options: ArduinoWorkspaceRootResolver.ResolveOptions
+    ): Promise<{ uri: string } | undefined> {
         const { hash, recentWorkspaces, recentSketches } = options;
-        for (const uri of [this.hashToUri(hash), ...recentWorkspaces, ...recentSketches].filter(notEmpty)) {
+        for (const uri of [
+            this.hashToUri(hash),
+            ...recentWorkspaces,
+            ...recentSketches,
+        ].filter(notEmpty)) {
             const valid = await this.isValid(uri);
             if (valid) {
                 return { uri };
@@ -56,13 +60,14 @@ export class ArduinoWorkspaceRootResolver {
     // - https://github.com/eclipse-theia/theia/blob/8196e9dcf9c8de8ea0910efeb5334a974f426966/packages/workspace/src/browser/workspace-service.ts#L143 and
     // - https://github.com/eclipse-theia/theia/blob/8196e9dcf9c8de8ea0910efeb5334a974f426966/packages/workspace/src/browser/workspace-service.ts#L423
     protected hashToUri(hash: string | undefined): string | undefined {
-        if (hash
-            && hash.length > 1
-            && hash.startsWith('#')) {
+        if (hash && hash.length > 1 && hash.startsWith('#')) {
             const path = hash.slice(1); // Trim the leading `#`.
-            return new URI(toUnix(path.slice(isWindows && hash.startsWith('/') ? 1 : 0))).withScheme('file').toString();
+            return new URI(
+                toUnix(path.slice(isWindows && hash.startsWith('/') ? 1 : 0))
+            )
+                .withScheme('file')
+                .toString();
         }
         return undefined;
     }
-
 }

arduino-ide-extension/src/browser/auth/authentication-client-service.ts

@@ -0,0 +1,93 @@
+import { inject, injectable } from 'inversify';
+import { Emitter } from '@theia/core/lib/common/event';
+import { JsonRpcProxy } from '@theia/core/lib/common/messaging/proxy-factory';
+import { WindowService } from '@theia/core/lib/browser/window/window-service';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import {
+    CommandRegistry,
+    CommandContribution,
+} from '@theia/core/lib/common/command';
+import {
+    AuthenticationService,
+    AuthenticationServiceClient,
+    AuthenticationSession,
+} from '../../common/protocol/authentication-service';
+import { CloudUserCommands } from './cloud-user-commands';
+import { serverPort } from '../../node/auth/authentication-server';
+import { AuthOptions } from '../../node/auth/types';
+import { ArduinoPreferences } from '../arduino-preferences';
+
+@injectable()
+export class AuthenticationClientService
+    implements
+        FrontendApplicationContribution,
+        CommandContribution,
+        AuthenticationServiceClient
+{
+    @inject(AuthenticationService)
+    protected readonly service: JsonRpcProxy<AuthenticationService>;
+
+    @inject(WindowService)
+    protected readonly windowService: WindowService;
+
+    @inject(ArduinoPreferences)
+    protected readonly arduinoPreferences: ArduinoPreferences;
+
+    protected authOptions: AuthOptions;
+    protected _session: AuthenticationSession | undefined;
+    protected readonly toDispose = new DisposableCollection();
+    protected readonly onSessionDidChangeEmitter = new Emitter<
+        AuthenticationSession | undefined
+    >();
+
+    readonly onSessionDidChange = this.onSessionDidChangeEmitter.event;
+
+    onStart(): void {
+        this.toDispose.push(this.onSessionDidChangeEmitter);
+        this.service.setClient(this);
+        this.service
+            .session()
+            .then((session) => this.notifySessionDidChange(session));
+        this.setOptions();
+        this.arduinoPreferences.onPreferenceChanged((event) => {
+            if (event.preferenceName.startsWith('arduino.auth.')) {
+                this.setOptions();
+            }
+        });
+    }
+
+    setOptions(): void {
+        this.service.setOptions({
+            redirectUri: `http://localhost:${serverPort}/callback`,
+            responseType: 'code',
+            clientID: this.arduinoPreferences['arduino.auth.clientID'],
+            domain: this.arduinoPreferences['arduino.auth.domain'],
+            audience: this.arduinoPreferences['arduino.auth.audience'],
+            registerUri: this.arduinoPreferences['arduino.auth.registerUri'],
+            scopes: ['openid', 'profile', 'email', 'offline_access'],
+        });
+    }
+
+    protected updateSession(session?: AuthenticationSession | undefined) {
+        this._session = session;
+        this.onSessionDidChangeEmitter.fire(this._session);
+    }
+
+    get session(): AuthenticationSession | undefined {
+        return this._session;
+    }
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(CloudUserCommands.LOGIN, {
+            execute: () => this.service.login(),
+        });
+        registry.registerCommand(CloudUserCommands.LOGOUT, {
+            execute: () => this.service.logout(),
+        });
+    }
+
+    notifySessionDidChange(session: AuthenticationSession | undefined): void {
+        this.updateSession(session);
+    }
+}

arduino-ide-extension/src/browser/auth/cloud-user-commands.ts

@@ -0,0 +1,18 @@
+import { Command } from '@theia/core/lib/common/command';
+
+export namespace CloudUserCommands {
+    export const LOGIN: Command = {
+        id: 'arduino-cloud--login',
+        label: 'Sign in',
+    };
+
+    export const LOGOUT: Command = {
+        id: 'arduino-cloud--logout',
+        label: 'Sign Out',
+    };
+
+    export const OPEN_PROFILE_CONTEXT_MENU: Command = {
+        id: 'arduino-cloud-sketchbook--open-profile-menu',
+        label: 'Contextual menu',
+    };
+}

arduino-ide-extension/src/browser/boards/boards-auto-installer.ts

@@ -1,11 +1,16 @@
 import { injectable, inject } from 'inversify';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
-import { BoardsService, BoardsPackage } from '../../common/protocol/boards-service';
+import {
+    BoardsService,
+    BoardsPackage,
+    Board,
+} from '../../common/protocol/boards-service';
 import { BoardsServiceProvider } from './boards-service-provider';
 import { BoardsListWidgetFrontendContribution } from './boards-widget-frontend-contribution';
-import { InstallationProgressDialog } from '../widgets/progress-dialog';
 import { BoardsConfig } from './boards-config';
+import { Installable } from '../../common/protocol';
+import { ResponseServiceImpl } from '../response-service-impl';
 
 /**
  * Listens on `BoardsConfig.Config` changes, if a board is selected which does not
@@ -13,7 +18,6 @@ import { BoardsConfig } from './boards-config';
  */
 @injectable()
 export class BoardsAutoInstaller implements FrontendApplicationContribution {
-
     @inject(MessageService)
     protected readonly messageService: MessageService;
 
@@ -23,40 +27,102 @@ export class BoardsAutoInstaller implements FrontendApplicationContribution {
     @inject(BoardsServiceProvider)
     protected readonly boardsServiceClient: BoardsServiceProvider;
 
+    @inject(ResponseServiceImpl)
+    protected readonly responseService: ResponseServiceImpl;
+
     @inject(BoardsListWidgetFrontendContribution)
     protected readonly boardsManagerFrontendContribution: BoardsListWidgetFrontendContribution;
 
+    // Workaround for https://github.com/eclipse-theia/theia/issues/9349
+    protected notifications: Board[] = [];
+
     onStart(): void {
-        this.boardsServiceClient.onBoardsConfigChanged(this.ensureCoreExists.bind(this));
+        this.boardsServiceClient.onBoardsConfigChanged(
+            this.ensureCoreExists.bind(this)
+        );
         this.ensureCoreExists(this.boardsServiceClient.boardsConfig);
     }
 
     protected ensureCoreExists(config: BoardsConfig.Config): void {
         const { selectedBoard } = config;
-        if (selectedBoard) {
-            this.boardsService.search({}).then(packages => {
-                const candidates = packages
-                    .filter(pkg => BoardsPackage.contains(selectedBoard, pkg))
-                    .filter(({ installable, installedVersion }) => installable && !installedVersion);
-                for (const candidate of candidates) {
-                    // tslint:disable-next-line:max-line-length
-                    this.messageService.info(`The \`"${candidate.name}"\` core has to be installed for the currently selected \`"${selectedBoard.name}"\` board. Do you want to install it now?`, 'Install Manually', 'Yes').then(async answer => {
-                        if (answer === 'Yes') {
-                            const dialog = new InstallationProgressDialog(candidate.name, candidate.availableVersions[0]);
-                            dialog.open();
-                            try {
-                                await this.boardsService.install({ item: candidate });
-                            } finally {
-                                dialog.close();
-                            }
-                        }
-                        if (answer) {
-                            this.boardsManagerFrontendContribution.openView({ reveal: true }).then(widget => widget.refresh(candidate.name.toLocaleLowerCase()));
-                        }
-                    });
+        if (
+            selectedBoard &&
+            !this.notifications.find((board) =>
+                Board.sameAs(board, selectedBoard)
+            )
+        ) {
+            this.notifications.push(selectedBoard);
+            this.boardsService.search({}).then((packages) => {
+                // filter packagesForBoard selecting matches from the cli (installed packages)
+                // and matches based on the board name
+                // NOTE: this ensures the Deprecated & new packages are all in the array
+                // so that we can check if any of the valid packages is already installed
+                const packagesForBoard = packages.filter(
+                    (pkg) =>
+                        BoardsPackage.contains(selectedBoard, pkg) ||
+                        pkg.boards.some(
+                            (board) => board.name === selectedBoard.name
+                        )
+                );
+
+                // check if one of the packages for the board is already installed. if so, no hint
+                if (
+                    packagesForBoard.some(
+                        ({ installedVersion }) => !!installedVersion
+                    )
+                ) {
+                    return;
                 }
-            })
+
+                // filter the installable (not installed) packages,
+                // CLI returns the packages already sorted with the deprecated ones at the end of the list
+                // in order to ensure the new ones are preferred
+                const candidates = packagesForBoard.filter(
+                    ({ installable, installedVersion }) =>
+                        installable && !installedVersion
+                );
+
+                const candidate = candidates[0];
+                if (candidate) {
+                    const version = candidate.availableVersions[0]
+                        ? `[v ${candidate.availableVersions[0]}]`
+                        : '';
+                    // tslint:disable-next-line:max-line-length
+                    this.messageService
+                        .info(
+                            `The \`"${candidate.name} ${version}"\` core has to be installed for the currently selected \`"${selectedBoard.name}"\` board. Do you want to install it now?`,
+                            'Install Manually',
+                            'Yes'
+                        )
+                        .then(async (answer) => {
+                            const index = this.notifications.findIndex(
+                                (board) => Board.sameAs(board, selectedBoard)
+                            );
+                            if (index !== -1) {
+                                this.notifications.splice(index, 1);
+                            }
+                            if (answer === 'Yes') {
+                                await Installable.installWithProgress({
+                                    installable: this.boardsService,
+                                    item: candidate,
+                                    messageService: this.messageService,
+                                    responseService: this.responseService,
+                                    version: candidate.availableVersions[0],
+                                });
+                                return;
+                            }
+                            if (answer) {
+                                this.boardsManagerFrontendContribution
+                                    .openView({ reveal: true })
+                                    .then((widget) =>
+                                        widget.refresh(
+                                            candidate.name.toLocaleLowerCase()
+                                        )
+                                    );
+                            }
+                        });
+                }
+            });
         }
     }
-
 }

arduino-ide-extension/src/browser/boards/boards-config-dialog-widget.tsx

@@ -9,7 +9,6 @@ import { NotificationCenter } from '../notification-center';
 
 @injectable()
 export class BoardsConfigDialogWidget extends ReactWidget {
-
     @inject(BoardsService)
     protected readonly boardsService: BoardsService;
 
@@ -20,7 +19,8 @@ export class BoardsConfigDialogWidget extends ReactWidget {
     protected readonly notificationCenter: NotificationCenter;
 
     protected readonly onFilterTextDidChangeEmitter = new Emitter<string>();
-    protected readonly onBoardConfigChangedEmitter = new Emitter<BoardsConfig.Config>();
+    protected readonly onBoardConfigChangedEmitter =
+        new Emitter<BoardsConfig.Config>();
     readonly onBoardConfigChanged = this.onBoardConfigChangedEmitter.event;
 
     protected focusNode: HTMLElement | undefined;
@@ -30,7 +30,7 @@ export class BoardsConfigDialogWidget extends ReactWidget {
         this.id = 'select-board-dialog';
         this.toDispose.pushAll([
             this.onBoardConfigChangedEmitter,
-            this.onFilterTextDidChangeEmitter
+            this.onFilterTextDidChangeEmitter,
         ]);
     }
 
@@ -40,21 +40,26 @@ export class BoardsConfigDialogWidget extends ReactWidget {
 
     protected fireConfigChanged = (config: BoardsConfig.Config) => {
         this.onBoardConfigChangedEmitter.fire(config);
-    }
+    };
 
     protected setFocusNode = (element: HTMLElement | undefined) => {
         this.focusNode = element;
-    }
+    };
 
     protected render(): React.ReactNode {
-        return <div className='selectBoardContainer'>
-            <BoardsConfig
-                boardsServiceProvider={this.boardsServiceClient}
-                notificationCenter={this.notificationCenter}
-                onConfigChange={this.fireConfigChanged}
-                onFocusNodeSet={this.setFocusNode}
-                onFilteredTextDidChangeEvent={this.onFilterTextDidChangeEmitter.event} />
-        </div>;
+        return (
+            <div className="selectBoardContainer">
+                <BoardsConfig
+                    boardsServiceProvider={this.boardsServiceClient}
+                    notificationCenter={this.notificationCenter}
+                    onConfigChange={this.fireConfigChanged}
+                    onFocusNodeSet={this.setFocusNode}
+                    onFilteredTextDidChangeEvent={
+                        this.onFilterTextDidChangeEmitter.event
+                    }
+                />
+            </div>
+        );
     }
 
     protected onActivateRequest(msg: Message): void {
@@ -64,5 +69,4 @@ export class BoardsConfigDialogWidget extends ReactWidget {
         }
         (this.focusNode || this.node).focus();
     }
-
 }

arduino-ide-extension/src/browser/boards/boards-config-dialog.ts

@@ -1,18 +1,21 @@
 import { injectable, inject, postConstruct } from 'inversify';
 import { Message } from '@phosphor/messaging';
-import { AbstractDialog, DialogProps, Widget, DialogError } from '@theia/core/lib/browser';
+import {
+    AbstractDialog,
+    DialogProps,
+    Widget,
+    DialogError,
+} from '@theia/core/lib/browser';
 import { BoardsConfig } from './boards-config';
 import { BoardsService } from '../../common/protocol/boards-service';
 import { BoardsServiceProvider } from './boards-service-provider';
 import { BoardsConfigDialogWidget } from './boards-config-dialog-widget';
 
 @injectable()
-export class BoardsConfigDialogProps extends DialogProps {
-}
+export class BoardsConfigDialogProps extends DialogProps {}
 
 @injectable()
 export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
-
     @inject(BoardsConfigDialogWidget)
     protected readonly widget: BoardsConfigDialogWidget;
 
@@ -24,7 +27,10 @@ export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
 
     protected config: BoardsConfig.Config = {};
 
-    constructor(@inject(BoardsConfigDialogProps) protected readonly props: BoardsConfigDialogProps) {
+    constructor(
+        @inject(BoardsConfigDialogProps)
+        protected readonly props: BoardsConfigDialogProps
+    ) {
         super(props);
 
         this.contentNode.classList.add('select-board-dialog');
@@ -36,16 +42,20 @@ export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
 
     @postConstruct()
     protected init(): void {
-        this.toDispose.push(this.boardsServiceClient.onBoardsConfigChanged(config => {
-            this.config = config;
-            this.update();
-        }));
+        this.toDispose.push(
+            this.boardsServiceClient.onBoardsConfigChanged((config) => {
+                this.config = config;
+                this.update();
+            })
+        );
     }
 
     /**
      * Pass in an empty string if you want to reset the search term. Using `undefined` has no effect.
      */
-    async open(query: string | undefined = undefined): Promise<BoardsConfig.Config | undefined> {
+    async open(
+        query: string | undefined = undefined
+    ): Promise<BoardsConfig.Config | undefined> {
         if (typeof query === 'string') {
             this.widget.search(query);
         }
@@ -67,9 +77,9 @@ export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
 
         for (const paragraph of [
             'Select both a Board and a Port if you want to upload a sketch.',
-            'If you only select a Board you will be able just to compile, but not to upload your sketch.'
+            'If you only select a Board you will be able just to compile, but not to upload your sketch.',
         ]) {
-            const p = document.createElement('p');
+            const p = document.createElement('div');
             p.textContent = paragraph;
             text.appendChild(p);
         }
@@ -82,10 +92,12 @@ export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
             Widget.detach(this.widget);
         }
         Widget.attach(this.widget, this.contentNode);
-        this.toDisposeOnDetach.push(this.widget.onBoardConfigChanged(config => {
-            this.config = config;
-            this.update();
-        }));
+        this.toDisposeOnDetach.push(
+            this.widget.onBoardConfigChanged((config) => {
+                this.config = config;
+                this.update();
+            })
+        );
         super.onAfterAttach(msg);
         this.update();
     }
@@ -119,5 +131,4 @@ export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
     get value(): BoardsConfig.Config {
         return this.config;
     }
-
 }

arduino-ide-extension/src/browser/boards/boards-config.tsx

@@ -3,12 +3,16 @@ import { Event } from '@theia/core/lib/common/event';
 import { notEmpty } from '@theia/core/lib/common/objects';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { Board, Port, AttachedBoardsChangeEvent, BoardWithPackage } from '../../common/protocol/boards-service';
+import {
+    Board,
+    Port,
+    AttachedBoardsChangeEvent,
+    BoardWithPackage,
+} from '../../common/protocol/boards-service';
 import { NotificationCenter } from '../notification-center';
 import { BoardsServiceProvider } from './boards-service-provider';
 
 export namespace BoardsConfig {
-
     export interface Config {
         selectedBoard?: Board;
         selectedPort?: Port;
@@ -28,18 +32,16 @@ export namespace BoardsConfig {
         showAllPorts: boolean;
         query: string;
     }
-
 }
 
 export abstract class Item<T> extends React.Component<{
-    item: T,
-    label: string,
-    selected: boolean,
-    onClick: (item: T) => void,
-    missing?: boolean,
-    details?: string
+    item: T;
+    label: string;
+    selected: boolean;
+    onClick: (item: T) => void;
+    missing?: boolean;
+    details?: string;
 }> {
-
     render(): React.ReactNode {
         const { selected, label, missing, details } = this.props;
         const classNames = ['item'];
@@ -47,25 +49,36 @@ export abstract class Item<T> extends React.Component<{
             classNames.push('selected');
         }
         if (missing === true) {
-            classNames.push('missing')
+            classNames.push('missing');
         }
-        return <div onClick={this.onClick} className={classNames.join(' ')} title={`${label}${!details ? '' : details}`}>
-            <div className='label'>
-                {label}
+        return (
+            <div
+                onClick={this.onClick}
+                className={classNames.join(' ')}
+                title={`${label}${!details ? '' : details}`}
+            >
+                <div className="label">{label}</div>
+                {!details ? '' : <div className="details">{details}</div>}
+                {!selected ? (
+                    ''
+                ) : (
+                    <div className="selected-icon">
+                        <i className="fa fa-check" />
+                    </div>
+                )}
             </div>
-            {!details ? '' : <div className='details'>{details}</div>}
-            {!selected ? '' : <div className='selected-icon'><i className='fa fa-check' /></div>}
-        </div>;
+        );
     }
 
     protected onClick = () => {
         this.props.onClick(this.props.item);
-    }
-
+    };
 }
 
-export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConfig.State> {
-
+export class BoardsConfig extends React.Component<
+    BoardsConfig.Props,
+    BoardsConfig.State
+> {
     protected toDispose = new DisposableCollection();
 
     constructor(props: BoardsConfig.Props) {
@@ -77,24 +90,51 @@ export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConf
             knownPorts: [],
             showAllPorts: false,
             query: '',
-            ...boardsConfig
-        }
+            ...boardsConfig,
+        };
     }
 
     componentDidMount() {
         this.updateBoards();
-        this.updatePorts(this.props.boardsServiceProvider.availableBoards.map(({ port }) => port).filter(notEmpty));
+        this.updatePorts(
+            this.props.boardsServiceProvider.availableBoards
+                .map(({ port }) => port)
+                .filter(notEmpty)
+        );
         this.toDispose.pushAll([
-            this.props.notificationCenter.onAttachedBoardsChanged(event => this.updatePorts(event.newState.ports, AttachedBoardsChangeEvent.diff(event).detached.ports)),
-            this.props.boardsServiceProvider.onBoardsConfigChanged(({ selectedBoard, selectedPort }) => {
-                this.setState({ selectedBoard, selectedPort }, () => this.fireConfigChanged());
-            }),
-            this.props.notificationCenter.onPlatformInstalled(() => this.updateBoards(this.state.query)),
-            this.props.notificationCenter.onPlatformUninstalled(() => this.updateBoards(this.state.query)),
-            this.props.notificationCenter.onIndexUpdated(() => this.updateBoards(this.state.query)),
-            this.props.notificationCenter.onDaemonStarted(() => this.updateBoards(this.state.query)),
-            this.props.notificationCenter.onDaemonStopped(() => this.setState({ searchResults: [] })),
-            this.props.onFilteredTextDidChangeEvent(query => this.setState({ query }, () => this.updateBoards(this.state.query)))
+            this.props.notificationCenter.onAttachedBoardsChanged((event) =>
+                this.updatePorts(
+                    event.newState.ports,
+                    AttachedBoardsChangeEvent.diff(event).detached.ports
+                )
+            ),
+            this.props.boardsServiceProvider.onBoardsConfigChanged(
+                ({ selectedBoard, selectedPort }) => {
+                    this.setState({ selectedBoard, selectedPort }, () =>
+                        this.fireConfigChanged()
+                    );
+                }
+            ),
+            this.props.notificationCenter.onPlatformInstalled(() =>
+                this.updateBoards(this.state.query)
+            ),
+            this.props.notificationCenter.onPlatformUninstalled(() =>
+                this.updateBoards(this.state.query)
+            ),
+            this.props.notificationCenter.onIndexUpdated(() =>
+                this.updateBoards(this.state.query)
+            ),
+            this.props.notificationCenter.onDaemonStarted(() =>
+                this.updateBoards(this.state.query)
+            ),
+            this.props.notificationCenter.onDaemonStopped(() =>
+                this.setState({ searchResults: [] })
+            ),
+            this.props.onFilteredTextDidChangeEvent((query) =>
+                this.setState({ query }, () =>
+                    this.updateBoards(this.state.query)
+                )
+            ),
         ]);
     }
 
@@ -107,73 +147,96 @@ export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConf
         this.props.onConfigChange({ selectedBoard, selectedPort });
     }
 
-    protected updateBoards = (eventOrQuery: React.ChangeEvent<HTMLInputElement> | string = '') => {
-        const query = typeof eventOrQuery === 'string'
-            ? eventOrQuery
-            : eventOrQuery.target.value.toLowerCase();
+    protected updateBoards = (
+        eventOrQuery: React.ChangeEvent<HTMLInputElement> | string = ''
+    ) => {
+        const query =
+            typeof eventOrQuery === 'string'
+                ? eventOrQuery
+                : eventOrQuery.target.value.toLowerCase();
         this.setState({ query });
-        this.queryBoards({ query }).then(searchResults => this.setState({ searchResults }));
-    }
+        this.queryBoards({ query }).then((searchResults) =>
+            this.setState({ searchResults })
+        );
+    };
 
     protected updatePorts = (ports: Port[] = [], removedPorts: Port[] = []) => {
         this.queryPorts(Promise.resolve(ports)).then(({ knownPorts }) => {
             let { selectedPort } = this.state;
             // If the currently selected port is not available anymore, unset the selected port.
-            if (removedPorts.some(port => Port.equals(port, selectedPort))) {
+            if (removedPorts.some((port) => Port.equals(port, selectedPort))) {
                 selectedPort = undefined;
             }
-            this.setState({ knownPorts, selectedPort }, () => this.fireConfigChanged());
+            this.setState({ knownPorts, selectedPort }, () =>
+                this.fireConfigChanged()
+            );
         });
-    }
+    };
 
-    protected queryBoards = (options: { query?: string } = {}): Promise<Array<BoardWithPackage>> => {
+    protected queryBoards = (
+        options: { query?: string } = {}
+    ): Promise<Array<BoardWithPackage>> => {
         return this.props.boardsServiceProvider.searchBoards(options);
-    }
+    };
 
     protected get availablePorts(): MaybePromise<Port[]> {
-        return this.props.boardsServiceProvider.availableBoards.map(({ port }) => port).filter(notEmpty);
+        return this.props.boardsServiceProvider.availableBoards
+            .map(({ port }) => port)
+            .filter(notEmpty);
     }
 
-    protected queryPorts = async (availablePorts: MaybePromise<Port[]> = this.availablePorts) => {
+    protected queryPorts = async (
+        availablePorts: MaybePromise<Port[]> = this.availablePorts
+    ) => {
         const ports = await availablePorts;
         return { knownPorts: ports.sort(Port.compare) };
-    }
+    };
 
     protected toggleFilterPorts = () => {
         this.setState({ showAllPorts: !this.state.showAllPorts });
-    }
+    };
 
     protected selectPort = (selectedPort: Port | undefined) => {
         this.setState({ selectedPort }, () => this.fireConfigChanged());
-    }
+    };
 
     protected selectBoard = (selectedBoard: BoardWithPackage | undefined) => {
         this.setState({ selectedBoard }, () => this.fireConfigChanged());
-    }
+    };
 
     protected focusNodeSet = (element: HTMLElement | null) => {
         this.props.onFocusNodeSet(element || undefined);
-    }
+    };
 
     render(): React.ReactNode {
-        return <div className='body'>
-            {this.renderContainer('boards', this.renderBoards.bind(this))}
-            {this.renderContainer('ports', this.renderPorts.bind(this), this.renderPortsFooter.bind(this))}
-        </div>;
+        return (
+            <div className="body">
+                {this.renderContainer('boards', this.renderBoards.bind(this))}
+                {this.renderContainer(
+                    'ports',
+                    this.renderPorts.bind(this),
+                    this.renderPortsFooter.bind(this)
+                )}
+            </div>
+        );
     }
 
-    protected renderContainer(title: string, contentRenderer: () => React.ReactNode, footerRenderer?: () => React.ReactNode): React.ReactNode {
-        return <div className='container'>
-            <div className='content'>
-                <div className='title'>
-                    {title}
-                </div>
-                {contentRenderer()}
-                <div className='footer'>
-                    {(footerRenderer ? footerRenderer() : '')}
+    protected renderContainer(
+        title: string,
+        contentRenderer: () => React.ReactNode,
+        footerRenderer?: () => React.ReactNode
+    ): React.ReactNode {
+        return (
+            <div className="container">
+                <div className="content">
+                    <div className="title">{title}</div>
+                    {contentRenderer()}
+                    <div className="footer">
+                        {footerRenderer ? footerRenderer() : ''}
+                    </div>
                 </div>
             </div>
-        </div>;
+        );
     }
 
     protected renderBoards(): React.ReactNode {
@@ -181,98 +244,111 @@ export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConf
         // Board names are not unique per core https://github.com/arduino/arduino-pro-ide/issues/262#issuecomment-661019560
         // It is tricky when the core is not yet installed, no FQBNs are available.
         const distinctBoards = new Map<string, Board.Detailed>();
-        const toKey = ({ name, packageName, fqbn }: Board.Detailed) => !!fqbn ? `${name}-${packageName}-${fqbn}` : `${name}-${packageName}`;
-        for (const board of Board.decorateBoards(selectedBoard, searchResults)) {
+        const toKey = ({ name, packageName, fqbn }: Board.Detailed) =>
+            !!fqbn
+                ? `${name}-${packageName}-${fqbn}`
+                : `${name}-${packageName}`;
+        for (const board of Board.decorateBoards(
+            selectedBoard,
+            searchResults
+        )) {
             const key = toKey(board);
             if (!distinctBoards.has(key)) {
                 distinctBoards.set(key, board);
             }
         }
 
-        return <React.Fragment>
-            <div className='search'>
-                <input
-                    type='search'
-                    value={query}
-                    className='theia-input'
-                    placeholder='SEARCH BOARD'
-                    onChange={this.updateBoards}
-                    ref={this.focusNodeSet}
-                />
-                <i className='fa fa-search'></i>
-            </div>
-            <div className='boards list'>
-                {Array.from(distinctBoards.values()).map(board => <Item<BoardWithPackage>
-                    key={`${board.name}-${board.packageName}`}
-                    item={board}
-                    label={board.name}
-                    details={board.details}
-                    selected={board.selected}
-                    onClick={this.selectBoard}
-                    missing={board.missing}
-                />)}
-            </div>
-        </React.Fragment>;
+        return (
+            <React.Fragment>
+                <div className="search">
+                    <input
+                        type="search"
+                        value={query}
+                        className="theia-input"
+                        placeholder="SEARCH BOARD"
+                        onChange={this.updateBoards}
+                        ref={this.focusNodeSet}
+                    />
+                    <i className="fa fa-search"></i>
+                </div>
+                <div className="boards list">
+                    {Array.from(distinctBoards.values()).map((board) => (
+                        <Item<BoardWithPackage>
+                            key={`${board.name}-${board.packageName}`}
+                            item={board}
+                            label={board.name}
+                            details={board.details}
+                            selected={board.selected}
+                            onClick={this.selectBoard}
+                            missing={board.missing}
+                        />
+                    ))}
+                </div>
+            </React.Fragment>
+        );
     }
 
     protected renderPorts(): React.ReactNode {
         const filter = this.state.showAllPorts ? () => true : Port.isBoardPort;
         const ports = this.state.knownPorts.filter(filter);
-        return !ports.length ?
-            (
-                <div className='loading noselect'>
-                    No ports discovered
-                </div>
-            ) :
-            (
-                <div className='ports list'>
-                    {ports.map(port => <Item<Port>
+        return !ports.length ? (
+            <div className="loading noselect">No ports discovered</div>
+        ) : (
+            <div className="ports list">
+                {ports.map((port) => (
+                    <Item<Port>
                         key={Port.toString(port)}
                         item={port}
                         label={Port.toString(port)}
                         selected={Port.equals(this.state.selectedPort, port)}
                         onClick={this.selectPort}
-                    />)}
-                </div>
-            );
+                    />
+                ))}
+            </div>
+        );
     }
 
     protected renderPortsFooter(): React.ReactNode {
-        return <div className='noselect'>
-            <label
-                title='Shows all available ports when enabled'>
-                <input
-                    type='checkbox'
-                    defaultChecked={this.state.showAllPorts}
-                    onChange={this.toggleFilterPorts}
-                />
-                <span>Show all ports</span>
-            </label>
-        </div>;
+        return (
+            <div className="noselect">
+                <label title="Shows all available ports when enabled">
+                    <input
+                        type="checkbox"
+                        defaultChecked={this.state.showAllPorts}
+                        onChange={this.toggleFilterPorts}
+                    />
+                    <span>Show all ports</span>
+                </label>
+            </div>
+        );
     }
-
 }
 
 export namespace BoardsConfig {
-
     export namespace Config {
-
         export function sameAs(config: Config, other: Config | Board): boolean {
             const { selectedBoard, selectedPort } = config;
             if (Board.is(other)) {
-                return !!selectedBoard
-                    && Board.equals(other, selectedBoard)
-                    && Port.sameAs(selectedPort, other.port);
+                return (
+                    !!selectedBoard &&
+                    Board.equals(other, selectedBoard) &&
+                    Port.sameAs(selectedPort, other.port)
+                );
             }
             return sameAs(config, other);
         }
 
         export function equals(left: Config, right: Config): boolean {
-            return left.selectedBoard === right.selectedBoard
-                && left.selectedPort === right.selectedPort;
+            return (
+                left.selectedBoard === right.selectedBoard &&
+                left.selectedPort === right.selectedPort
+            );
         }
 
-        export function toString(config: Config, options: { default: string } = { default: '' }): string {
+        export function toString(
+            config: Config,
+            options: { default: string } = { default: '' }
+        ): string {
             const { selectedBoard, selectedPort: port } = config;
             if (!selectedBoard) {
                 return options.default;
@@ -281,6 +357,55 @@ export namespace BoardsConfig {
             return `${name}${port ? ' at ' + Port.toString(port) : ''}`;
         }
 
-    }
+        export function setConfig(
+            config: Config | undefined,
+            urlToAttachTo: URL
+        ): URL {
+            const copy = new URL(urlToAttachTo.toString());
+            if (!config) {
+                copy.searchParams.delete('boards-config');
+                return copy;
+            }
 
+            const selectedBoard = config.selectedBoard
+                ? {
+                      name: config.selectedBoard.name,
+                      fqbn: config.selectedBoard.fqbn,
+                  }
+                : undefined;
+            const selectedPort = config.selectedPort
+                ? {
+                      protocol: config.selectedPort.protocol,
+                      address: config.selectedPort.address,
+                  }
+                : undefined;
+            const jsonConfig = JSON.stringify({ selectedBoard, selectedPort });
+            copy.searchParams.set(
+                'boards-config',
+                encodeURIComponent(jsonConfig)
+            );
+            return copy;
+        }
+
+        export function getConfig(url: URL): Config | undefined {
+            const encoded = url.searchParams.get('boards-config');
+            if (!encoded) {
+                return undefined;
+            }
+            try {
+                const raw = decodeURIComponent(encoded);
+                const candidate = JSON.parse(raw);
+                if (typeof candidate === 'object') {
+                    return candidate;
+                }
+                console.warn(
+                    `Expected candidate to be an object. It was ${typeof candidate}. URL was: ${url}`
+                );
+                return undefined;
+            } catch (e) {
+                console.log(`Could not get board config from URL: ${url}.`, e);
+                return undefined;
+            }
+        }
+    }
 }

arduino-ide-extension/src/browser/boards/boards-data-menu-updater.ts

@@ -1,18 +1,20 @@
 import * as PQueue from 'p-queue';
 import { inject, injectable } from 'inversify';
 import { CommandRegistry } from '@theia/core/lib/common/command';
-import { MenuModelRegistry, MenuNode } from '@theia/core/lib/common/menu';
-import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
+import { MenuModelRegistry } from '@theia/core/lib/common/menu';
+import {
+    Disposable,
+    DisposableCollection,
+} from '@theia/core/lib/common/disposable';
 import { BoardsServiceProvider } from './boards-service-provider';
 import { Board, ConfigOption, Programmer } from '../../common/protocol';
 import { FrontendApplicationContribution } from '@theia/core/lib/browser';
 import { BoardsDataStore } from './boards-data-store';
 import { MainMenuManager } from '../../common/main-menu-manager';
-import { ArduinoMenus } from '../menu/arduino-menus';
+import { ArduinoMenus, unregisterSubmenu } from '../menu/arduino-menus';
 
 @injectable()
 export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
-
     @inject(CommandRegistry)
     protected readonly commandRegistry: CommandRegistry;
 
@@ -32,63 +34,153 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
     protected readonly toDisposeOnBoardChange = new DisposableCollection();
 
     async onStart(): Promise<void> {
-        this.updateMenuActions(this.boardsServiceClient.boardsConfig.selectedBoard);
-        this.boardsDataStore.onChanged(() => this.updateMenuActions(this.boardsServiceClient.boardsConfig.selectedBoard));
-        this.boardsServiceClient.onBoardsConfigChanged(({ selectedBoard }) => this.updateMenuActions(selectedBoard));
+        this.updateMenuActions(
+            this.boardsServiceClient.boardsConfig.selectedBoard
+        );
+        this.boardsDataStore.onChanged(() =>
+            this.updateMenuActions(
+                this.boardsServiceClient.boardsConfig.selectedBoard
+            )
+        );
+        this.boardsServiceClient.onBoardsConfigChanged(({ selectedBoard }) =>
+            this.updateMenuActions(selectedBoard)
+        );
     }
 
-    protected async updateMenuActions(selectedBoard: Board | undefined): Promise<void> {
+    protected async updateMenuActions(
+        selectedBoard: Board | undefined
+    ): Promise<void> {
         return this.queue.add(async () => {
             this.toDisposeOnBoardChange.dispose();
             this.mainMenuManager.update();
             if (selectedBoard) {
                 const { fqbn } = selectedBoard;
                 if (fqbn) {
-                    const { configOptions, programmers, selectedProgrammer } = await this.boardsDataStore.getData(fqbn);
+                    const { configOptions, programmers, selectedProgrammer } =
+                        await this.boardsDataStore.getData(fqbn);
                     if (configOptions.length) {
-                        const boardsConfigMenuPath = [...ArduinoMenus.TOOLS__BOARD_SETTINGS_GROUP, 'z01_boardsConfig']; // `z_` is for ordering.
-                        for (const { label, option, values } of configOptions.sort(ConfigOption.LABEL_COMPARATOR)) {
-                            const menuPath = [...boardsConfigMenuPath, `${option}`];
-                            const commands = new Map<string, Disposable & { label: string }>()
+                        const boardsConfigMenuPath = [
+                            ...ArduinoMenus.TOOLS__BOARD_SETTINGS_GROUP,
+                            'z01_boardsConfig',
+                        ]; // `z_` is for ordering.
+                        for (const {
+                            label,
+                            option,
+                            values,
+                        } of configOptions.sort(
+                            ConfigOption.LABEL_COMPARATOR
+                        )) {
+                            const menuPath = [
+                                ...boardsConfigMenuPath,
+                                `${option}`,
+                            ];
+                            const commands = new Map<
+                                string,
+                                Disposable & { label: string }
+                            >();
                             for (const value of values) {
                                 const id = `${fqbn}-${option}--${value.value}`;
                                 const command = { id };
                                 const selectedValue = value.value;
                                 const handler = {
-                                    execute: () => this.boardsDataStore.selectConfigOption({ fqbn, option, selectedValue }),
-                                    isToggled: () => value.selected
+                                    execute: () =>
+                                        this.boardsDataStore.selectConfigOption(
+                                            { fqbn, option, selectedValue }
+                                        ),
+                                    isToggled: () => value.selected,
                                 };
-                                commands.set(id, Object.assign(this.commandRegistry.registerCommand(command, handler), { label: value.label }));
+                                commands.set(
+                                    id,
+                                    Object.assign(
+                                        this.commandRegistry.registerCommand(
+                                            command,
+                                            handler
+                                        ),
+                                        { label: value.label }
+                                    )
+                                );
                             }
                             this.menuRegistry.registerSubmenu(menuPath, label);
                             this.toDisposeOnBoardChange.pushAll([
                                 ...commands.values(),
-                                Disposable.create(() => this.unregisterSubmenu(menuPath)), // We cannot dispose submenu entries: https://github.com/eclipse-theia/theia/issues/7299
-                                ...Array.from(commands.keys()).map((commandId, i) => {
-                                    const { label } = commands.get(commandId)!;
-                                    this.menuRegistry.registerMenuAction(menuPath, { commandId, order: `${i}`, label });
-                                    return Disposable.create(() => this.menuRegistry.unregisterMenuAction(commandId));
-                                })
+                                Disposable.create(() =>
+                                    unregisterSubmenu(
+                                        menuPath,
+                                        this.menuRegistry
+                                    )
+                                ),
+                                ...Array.from(commands.keys()).map(
+                                    (commandId, i) => {
+                                        const { label } =
+                                            commands.get(commandId)!;
+                                        this.menuRegistry.registerMenuAction(
+                                            menuPath,
+                                            { commandId, order: `${i}`, label }
+                                        );
+                                        return Disposable.create(() =>
+                                            this.menuRegistry.unregisterMenuAction(
+                                                commandId
+                                            )
+                                        );
+                                    }
+                                ),
                             ]);
                         }
                     }
                     if (programmers.length) {
-                        const programmersMenuPath = [...ArduinoMenus.TOOLS__BOARD_SETTINGS_GROUP, 'z02_programmers'];
-                        const label = selectedProgrammer ? `Programmer: "${selectedProgrammer.name}"` : 'Programmer'
-                        this.menuRegistry.registerSubmenu(programmersMenuPath, label);
-                        this.toDisposeOnBoardChange.push(Disposable.create(() => this.unregisterSubmenu(programmersMenuPath)));
+                        const programmersMenuPath = [
+                            ...ArduinoMenus.TOOLS__BOARD_SETTINGS_GROUP,
+                            'z02_programmers',
+                        ];
+                        const label = selectedProgrammer
+                            ? `Programmer: "${selectedProgrammer.name}"`
+                            : 'Programmer';
+                        this.menuRegistry.registerSubmenu(
+                            programmersMenuPath,
+                            label
+                        );
+                        this.toDisposeOnBoardChange.push(
+                            Disposable.create(() =>
+                                unregisterSubmenu(
+                                    programmersMenuPath,
+                                    this.menuRegistry
+                                )
+                            )
+                        );
                         for (const programmer of programmers) {
                             const { id, name } = programmer;
                             const command = { id: `${fqbn}-programmer--${id}` };
                             const handler = {
-                                execute: () => this.boardsDataStore.selectProgrammer({ fqbn, selectedProgrammer: programmer }),
-                                isToggled: () => Programmer.equals(programmer, selectedProgrammer)
+                                execute: () =>
+                                    this.boardsDataStore.selectProgrammer({
+                                        fqbn,
+                                        selectedProgrammer: programmer,
+                                    }),
+                                isToggled: () =>
+                                    Programmer.equals(
+                                        programmer,
+                                        selectedProgrammer
+                                    ),
                             };
-                            this.menuRegistry.registerMenuAction(programmersMenuPath, { commandId: command.id, label: name });
-                            this.commandRegistry.registerCommand(command, handler);
+                            this.menuRegistry.registerMenuAction(
+                                programmersMenuPath,
+                                { commandId: command.id, label: name }
+                            );
+                            this.commandRegistry.registerCommand(
+                                command,
+                                handler
+                            );
                             this.toDisposeOnBoardChange.pushAll([
-                                Disposable.create(() => this.commandRegistry.unregisterCommand(command)),
-                                Disposable.create(() => this.menuRegistry.unregisterMenuAction(command.id))
+                                Disposable.create(() =>
+                                    this.commandRegistry.unregisterCommand(
+                                        command
+                                    )
+                                ),
+                                Disposable.create(() =>
+                                    this.menuRegistry.unregisterMenuAction(
+                                        command.id
+                                    )
+                                ),
                             ]);
                         }
                     }
@@ -97,21 +189,4 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
             }
         });
     }
-
-    protected unregisterSubmenu(menuPath: string[]): void {
-        if (menuPath.length < 2) {
-            throw new Error(`Expected at least two item as a menu-path. Got ${JSON.stringify(menuPath)} instead.`);
-        }
-        const toRemove = menuPath[menuPath.length - 1];
-        const parentMenuPath = menuPath.slice(0, menuPath.length - 1);
-        // This is unsafe. Calling `getMenu` with a non-existing menu-path will result in a new menu creation.
-        // https://github.com/eclipse-theia/theia/issues/7300
-        const parent = this.menuRegistry.getMenu(parentMenuPath);
-        const index = parent.children.findIndex(({ id }) => id === toRemove);
-        if (index === -1) {
-            throw new Error(`Could not find menu with menu-path: ${JSON.stringify(menuPath)}.`);
-        }
-        (parent.children as Array<MenuNode>).splice(index, 1);
-    }
-
 }

arduino-ide-extension/src/browser/boards/boards-data-store.ts

@@ -3,14 +3,22 @@ import { ILogger } from '@theia/core/lib/common/logger';
 import { deepClone } from '@theia/core/lib/common/objects';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { Event, Emitter } from '@theia/core/lib/common/event';
-import { FrontendApplicationContribution, LocalStorageService } from '@theia/core/lib/browser';
+import {
+    FrontendApplicationContribution,
+    LocalStorageService,
+} from '@theia/core/lib/browser';
 import { notEmpty } from '../../common/utils';
-import { BoardsService, ConfigOption, Installable, BoardDetails, Programmer } from '../../common/protocol';
+import {
+    BoardsService,
+    ConfigOption,
+    Installable,
+    BoardDetails,
+    Programmer,
+} from '../../common/protocol';
 import { NotificationCenter } from '../notification-center';
 
 @injectable()
 export class BoardsDataStore implements FrontendApplicationContribution {
-
     @inject(ILogger)
     @named('store')
     protected readonly logger: ILogger;
@@ -33,9 +41,14 @@ export class BoardsDataStore implements FrontendApplicationContribution {
                 return;
             }
             let shouldFireChanged = false;
-            for (const fqbn of item.boards.map(({ fqbn }) => fqbn).filter(notEmpty).filter(fqbn => !!fqbn)) {
+            for (const fqbn of item.boards
+                .map(({ fqbn }) => fqbn)
+                .filter(notEmpty)
+                .filter((fqbn) => !!fqbn)) {
                 const key = this.getStorageKey(fqbn, version);
-                let data = await this.storageService.getData<ConfigOption[] | undefined>(key);
+                let data = await this.storageService.getData<
+                    ConfigOption[] | undefined
+                >(key);
                 if (!data || !data.length) {
                     const details = await this.getBoardDetailsSafe(fqbn);
                     if (details) {
@@ -59,20 +72,27 @@ export class BoardsDataStore implements FrontendApplicationContribution {
 
     async appendConfigToFqbn(
         fqbn: string | undefined,
-        boardsPackageVersion: MaybePromise<Installable.Version | undefined> = this.getBoardsPackageVersion(fqbn)): Promise<string | undefined> {
-
+        boardsPackageVersion: MaybePromise<
+            Installable.Version | undefined
+        > = this.getBoardsPackageVersion(fqbn)
+    ): Promise<string | undefined> {
         if (!fqbn) {
             return undefined;
         }
 
-        const { configOptions } = await this.getData(fqbn, boardsPackageVersion);
+        const { configOptions } = await this.getData(
+            fqbn,
+            boardsPackageVersion
+        );
         return ConfigOption.decorate(fqbn, configOptions);
     }
 
     async getData(
         fqbn: string | undefined,
-        boardsPackageVersion: MaybePromise<Installable.Version | undefined> = this.getBoardsPackageVersion(fqbn)): Promise<BoardsDataStore.Data> {
-
+        boardsPackageVersion: MaybePromise<
+            Installable.Version | undefined
+        > = this.getBoardsPackageVersion(fqbn)
+    ): Promise<BoardsDataStore.Data> {
         if (!fqbn) {
             return BoardsDataStore.Data.EMPTY;
         }
@@ -82,7 +102,9 @@ export class BoardsDataStore implements FrontendApplicationContribution {
             return BoardsDataStore.Data.EMPTY;
         }
         const key = this.getStorageKey(fqbn, version);
-        let data = await this.storageService.getData<BoardsDataStore.Data | undefined>(key, undefined);
+        let data = await this.storageService.getData<
+            BoardsDataStore.Data | undefined
+        >(key, undefined);
         if (BoardsDataStore.Data.is(data)) {
             return data;
         }
@@ -92,18 +114,28 @@ export class BoardsDataStore implements FrontendApplicationContribution {
             return BoardsDataStore.Data.EMPTY;
         }
 
-        data = { configOptions: boardDetails.configOptions, programmers: boardDetails.programmers };
+        data = {
+            configOptions: boardDetails.configOptions,
+            programmers: boardDetails.programmers,
+        };
         await this.storageService.setData(key, data);
         return data;
     }
 
     async selectProgrammer(
-        { fqbn, selectedProgrammer }: { fqbn: string, selectedProgrammer: Programmer },
-        boardsPackageVersion: MaybePromise<Installable.Version | undefined> = this.getBoardsPackageVersion(fqbn)): Promise<boolean> {
-
+        {
+            fqbn,
+            selectedProgrammer,
+        }: { fqbn: string; selectedProgrammer: Programmer },
+        boardsPackageVersion: MaybePromise<
+            Installable.Version | undefined
+        > = this.getBoardsPackageVersion(fqbn)
+    ): Promise<boolean> {
         const data = deepClone(await this.getData(fqbn, boardsPackageVersion));
         const { programmers } = data;
-        if (!programmers.find(p => Programmer.equals(selectedProgrammer, p))) {
+        if (
+            !programmers.find((p) => Programmer.equals(selectedProgrammer, p))
+        ) {
             return false;
         }
 
@@ -112,18 +144,28 @@ export class BoardsDataStore implements FrontendApplicationContribution {
             return false;
         }
 
-        await this.setData({ fqbn, data: { ...data, selectedProgrammer }, version });
+        await this.setData({
+            fqbn,
+            data: { ...data, selectedProgrammer },
+            version,
+        });
         this.fireChanged();
         return true;
     }
 
     async selectConfigOption(
-        { fqbn, option, selectedValue }: { fqbn: string, option: string, selectedValue: string },
-        boardsPackageVersion: MaybePromise<Installable.Version | undefined> = this.getBoardsPackageVersion(fqbn)): Promise<boolean> {
-
+        {
+            fqbn,
+            option,
+            selectedValue,
+        }: { fqbn: string; option: string; selectedValue: string },
+        boardsPackageVersion: MaybePromise<
+            Installable.Version | undefined
+        > = this.getBoardsPackageVersion(fqbn)
+    ): Promise<boolean> {
         const data = deepClone(await this.getData(fqbn, boardsPackageVersion));
         const { configOptions } = data;
-        const configOption = configOptions.find(c => c.option === option);
+        const configOption = configOptions.find((c) => c.option === option);
         if (!configOption) {
             return false;
         }
@@ -149,26 +191,46 @@ export class BoardsDataStore implements FrontendApplicationContribution {
         return true;
     }
 
-    protected async setData(
-        { fqbn, data, version }: { fqbn: string, data: BoardsDataStore.Data, version: Installable.Version }): Promise<void> {
-
+    protected async setData({
+        fqbn,
+        data,
+        version,
+    }: {
+        fqbn: string;
+        data: BoardsDataStore.Data;
+        version: Installable.Version;
+    }): Promise<void> {
         const key = this.getStorageKey(fqbn, version);
         return this.storageService.setData(key, data);
     }
 
-    protected getStorageKey(fqbn: string, version: Installable.Version): string {
-        return `.arduinoProIDE-configOptions-${version}-${fqbn}`;
+    protected getStorageKey(
+        fqbn: string,
+        version: Installable.Version
+    ): string {
+        return `.arduinoIDE-configOptions-${version}-${fqbn}`;
     }
 
-    protected async getBoardDetailsSafe(fqbn: string): Promise<BoardDetails | undefined> {
+    protected async getBoardDetailsSafe(
+        fqbn: string
+    ): Promise<BoardDetails | undefined> {
         try {
             const details = this.boardsService.getBoardDetails({ fqbn });
             return details;
         } catch (err) {
-            if (err instanceof Error && err.message.includes('loading board data') && err.message.includes('is not installed')) {
-                this.logger.warn(`The boards package is not installed for board with FQBN: ${fqbn}`);
+            if (
+                err instanceof Error &&
+                err.message.includes('loading board data') &&
+                err.message.includes('is not installed')
+            ) {
+                this.logger.warn(
+                    `The boards package is not installed for board with FQBN: ${fqbn}`
+                );
             } else {
-                this.logger.error(`An unexpected error occurred while retrieving the board details for ${fqbn}.`, err);
+                this.logger.error(
+                    `An unexpected error occurred while retrieving the board details for ${fqbn}.`,
+                    err
+                );
             }
             return undefined;
         }
@@ -178,17 +240,20 @@ export class BoardsDataStore implements FrontendApplicationContribution {
         this.onChangedEmitter.fire();
     }
 
-    protected async getBoardsPackageVersion(fqbn: string | undefined): Promise<Installable.Version | undefined> {
+    protected async getBoardsPackageVersion(
+        fqbn: string | undefined
+    ): Promise<Installable.Version | undefined> {
         if (!fqbn) {
             return undefined;
         }
-        const boardsPackage = await this.boardsService.getContainerBoardPackage({ fqbn });
+        const boardsPackage = await this.boardsService.getContainerBoardPackage(
+            { fqbn }
+        );
         if (!boardsPackage) {
             return undefined;
         }
         return boardsPackage.installedVersion;
     }
-
 }
 
 export namespace BoardsDataStore {
@@ -200,12 +265,16 @@ export namespace BoardsDataStore {
     export namespace Data {
         export const EMPTY: Data = {
             configOptions: [],
-            programmers: []
+            programmers: [],
         };
         export function is(arg: any): arg is Data {
-            return !!arg
-                && 'configOptions' in arg && Array.isArray(arg['configOptions'])
-                && 'programmers' in arg && Array.isArray(arg['programmers'])
+            return (
+                !!arg &&
+                'configOptions' in arg &&
+                Array.isArray(arg['configOptions']) &&
+                'programmers' in arg &&
+                Array.isArray(arg['programmers'])
+            );
         }
     }
 }

arduino-ide-extension/src/browser/boards/boards-list-widget.ts

@@ -1,18 +1,21 @@
 import { inject, injectable, postConstruct } from 'inversify';
-import { BoardsPackage, BoardsService } from '../../common/protocol/boards-service';
+import {
+    BoardsPackage,
+    BoardsService,
+} from '../../common/protocol/boards-service';
 import { ListWidget } from '../widgets/component-list/list-widget';
 import { ListItemRenderer } from '../widgets/component-list/list-item-renderer';
 
 @injectable()
 export class BoardsListWidget extends ListWidget<BoardsPackage> {
-
     static WIDGET_ID = 'boards-list-widget';
     static WIDGET_LABEL = 'Boards Manager';
 
     constructor(
         @inject(BoardsService) protected service: BoardsService,
-        @inject(ListItemRenderer) protected itemRenderer: ListItemRenderer<BoardsPackage>) {
-
+        @inject(ListItemRenderer)
+        protected itemRenderer: ListItemRenderer<BoardsPackage>
+    ) {
         super({
             id: BoardsListWidget.WIDGET_ID,
             label: BoardsListWidget.WIDGET_LABEL,
@@ -20,7 +23,8 @@ export class BoardsListWidget extends ListWidget<BoardsPackage> {
             searchable: service,
             installable: service,
             itemLabel: (item: BoardsPackage) => item.name,
-            itemRenderer
+            itemDeprecated: (item: BoardsPackage) => item.deprecated,
+            itemRenderer,
         });
     }
 
@@ -28,9 +32,42 @@ export class BoardsListWidget extends ListWidget<BoardsPackage> {
     protected init(): void {
         super.init();
         this.toDispose.pushAll([
-            this.notificationCenter.onPlatformInstalled(() => this.refresh(undefined)),
-            this.notificationCenter.onPlatformUninstalled(() => this.refresh(undefined)),
+            this.notificationCenter.onPlatformInstalled(() =>
+                this.refresh(undefined)
+            ),
+            this.notificationCenter.onPlatformUninstalled(() =>
+                this.refresh(undefined)
+            ),
         ]);
     }
 
+    protected async install({
+        item,
+        progressId,
+        version,
+    }: {
+        item: BoardsPackage;
+        progressId: string;
+        version: string;
+    }): Promise<void> {
+        await super.install({ item, progressId, version });
+        this.messageService.info(
+            `Successfully installed platform ${item.name}:${version}`,
+            { timeout: 3000 }
+        );
+    }
+
+    protected async uninstall({
+        item,
+        progressId,
+    }: {
+        item: BoardsPackage;
+        progressId: string;
+    }): Promise<void> {
+        await super.uninstall({ item, progressId });
+        this.messageService.info(
+            `Successfully uninstalled platform ${item.name}:${item.installedVersion}`,
+            { timeout: 3000 }
+        );
+    }
 }

arduino-ide-extension/src/browser/boards/boards-service-provider.ts

@@ -1,8 +1,8 @@
 import { injectable, inject } from 'inversify';
 import { Emitter } from '@theia/core/lib/common/event';
 import { ILogger } from '@theia/core/lib/common/logger';
+import { CommandService } from '@theia/core/lib/common/command';
 import { MessageService } from '@theia/core/lib/common/message-service';
-import { StorageService } from '@theia/core/lib/browser/storage-service';
 import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
 import { RecursiveRequired } from '../../common/types';
 import {
@@ -11,32 +11,22 @@ import {
     BoardsService,
     BoardsPackage,
     AttachedBoardsChangeEvent,
-    BoardWithPackage
+    BoardWithPackage,
 } from '../../common/protocol';
 import { BoardsConfig } from './boards-config';
 import { naturalCompare } from '../../common/utils';
-import { compareAnything } from '../theia/monaco/comparers';
 import { NotificationCenter } from '../notification-center';
-import { CommandService } from '@theia/core';
 import { ArduinoCommands } from '../arduino-commands';
-
-interface BoardMatch {
-    readonly board: BoardWithPackage;
-    readonly matches: monaco.filters.IMatch[] | undefined;
-}
+import { StorageWrapper } from '../storage-wrapper';
 
 @injectable()
 export class BoardsServiceProvider implements FrontendApplicationContribution {
-
     @inject(ILogger)
     protected logger: ILogger;
 
     @inject(MessageService)
     protected messageService: MessageService;
 
-    @inject(StorageService)
-    protected storageService: StorageService;
-
     @inject(BoardsService)
     protected boardsService: BoardsService;
 
@@ -46,8 +36,11 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
     @inject(NotificationCenter)
     protected notificationCenter: NotificationCenter;
 
-    protected readonly onBoardsConfigChangedEmitter = new Emitter<BoardsConfig.Config>();
-    protected readonly onAvailableBoardsChangedEmitter = new Emitter<AvailableBoard[]>();
+    protected readonly onBoardsConfigChangedEmitter =
+        new Emitter<BoardsConfig.Config>();
+    protected readonly onAvailableBoardsChangedEmitter = new Emitter<
+        AvailableBoard[]
+    >();
 
     /**
      * Used for the auto-reconnecting. Sometimes, the attached board gets disconnected after uploading something to it.
@@ -56,7 +49,10 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
      * We have to listen on such changes and auto-reconnect the same board on another port.
      * See: https://arduino.slack.com/archives/CJJHJCJSJ/p1568645417013000?thread_ts=1568640504.009400&cid=CJJHJCJSJ
      */
-    protected latestValidBoardsConfig: RecursiveRequired<BoardsConfig.Config> | undefined = undefined;
+    protected latestValidBoardsConfig:
+        | RecursiveRequired<BoardsConfig.Config>
+        | undefined = undefined;
+    protected latestBoardsConfig: BoardsConfig.Config | undefined = undefined;
     protected _boardsConfig: BoardsConfig.Config = {};
     protected _attachedBoards: Board[] = []; // This does not contain the `Unknown` boards. They're visible from the available ports only.
     protected _availablePorts: Port[] = [];
@@ -70,17 +66,24 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
      * This even also emitted when the board package for the currently selected board was uninstalled.
      */
     readonly onBoardsConfigChanged = this.onBoardsConfigChangedEmitter.event;
-    readonly onAvailableBoardsChanged = this.onAvailableBoardsChangedEmitter.event;
+    readonly onAvailableBoardsChanged =
+        this.onAvailableBoardsChangedEmitter.event;
 
     onStart(): void {
-        this.notificationCenter.onAttachedBoardsChanged(this.notifyAttachedBoardsChanged.bind(this));
-        this.notificationCenter.onPlatformInstalled(this.notifyPlatformInstalled.bind(this));
-        this.notificationCenter.onPlatformUninstalled(this.notifyPlatformUninstalled.bind(this));
+        this.notificationCenter.onAttachedBoardsChanged(
+            this.notifyAttachedBoardsChanged.bind(this)
+        );
+        this.notificationCenter.onPlatformInstalled(
+            this.notifyPlatformInstalled.bind(this)
+        );
+        this.notificationCenter.onPlatformUninstalled(
+            this.notifyPlatformUninstalled.bind(this)
+        );
 
         Promise.all([
             this.boardsService.getAttachedBoards(),
             this.boardsService.getAvailablePorts(),
-            this.loadState()
+            this.loadState(),
         ]).then(([attachedBoards, availablePorts]) => {
             this._attachedBoards = attachedBoards;
             this._availablePorts = availablePorts;
@@ -88,11 +91,13 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
         });
     }
 
-    protected notifyAttachedBoardsChanged(event: AttachedBoardsChangeEvent): void {
+    protected notifyAttachedBoardsChanged(
+        event: AttachedBoardsChangeEvent
+    ): void {
         if (!AttachedBoardsChangeEvent.isEmpty(event)) {
             this.logger.info('Attached boards and available ports changed:');
             this.logger.info(AttachedBoardsChangeEvent.toString(event));
-            this.logger.info(`------------------------------------------`);
+            this.logger.info('------------------------------------------');
         }
         this._attachedBoards = event.newState.boards;
         this._availablePorts = event.newState.ports;
@@ -104,12 +109,20 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
         const { selectedBoard } = this.boardsConfig;
         const { installedVersion, id } = event.item;
         if (selectedBoard) {
-            const installedBoard = event.item.boards.find(({ name }) => name === selectedBoard.name);
-            if (installedBoard && (!selectedBoard.fqbn || selectedBoard.fqbn === installedBoard.fqbn)) {
-                this.logger.info(`Board package ${id}[${installedVersion}] was installed. Updating the FQBN of the currently selected ${selectedBoard.name} board. [FQBN: ${installedBoard.fqbn}]`);
+            const installedBoard = event.item.boards.find(
+                ({ name }) => name === selectedBoard.name
+            );
+            if (
+                installedBoard &&
+                (!selectedBoard.fqbn ||
+                    selectedBoard.fqbn === installedBoard.fqbn)
+            ) {
+                this.logger.info(
+                    `Board package ${id}[${installedVersion}] was installed. Updating the FQBN of the currently selected ${selectedBoard.name} board. [FQBN: ${installedBoard.fqbn}]`
+                );
                 this.boardsConfig = {
                     ...this.boardsConfig,
-                    selectedBoard: installedBoard
+                    selectedBoard: installedBoard,
                 };
                 return;
             }
@@ -117,13 +130,26 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
             // This logic handles it "gracefully" by unselecting the board, so that we can avoid no FQBN is set error.
             // https://github.com/arduino/arduino-cli/issues/620
             // https://github.com/arduino/arduino-pro-ide/issues/374
-            if (BoardWithPackage.is(selectedBoard) && selectedBoard.packageId === event.item.id && !installedBoard) {
-                this.messageService.warn(`Could not find previously selected board '${selectedBoard.name}' in installed platform '${event.item.name}'. Please manually reselect the board you want to use. Do you want to reselect it now?`, 'Reselect later', 'Yes').then(async answer => {
-                    if (answer === 'Yes') {
-                        this.commandService.executeCommand(ArduinoCommands.OPEN_BOARDS_DIALOG.id, selectedBoard.name);
-                    }
-                });
-                this.boardsConfig = {}
+            if (
+                BoardWithPackage.is(selectedBoard) &&
+                selectedBoard.packageId === event.item.id &&
+                !installedBoard
+            ) {
+                this.messageService
+                    .warn(
+                        `Could not find previously selected board '${selectedBoard.name}' in installed platform '${event.item.name}'. Please manually reselect the board you want to use. Do you want to reselect it now?`,
+                        'Reselect later',
+                        'Yes'
+                    )
+                    .then(async (answer) => {
+                        if (answer === 'Yes') {
+                            this.commandService.executeCommand(
+                                ArduinoCommands.OPEN_BOARDS_DIALOG.id,
+                                selectedBoard.name
+                            );
+                        }
+                    });
+                this.boardsConfig = {};
                 return;
             }
             // Trigger a board re-set. See: https://github.com/arduino/arduino-cli/issues/954
@@ -136,41 +162,82 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
         this.logger.info('Boards package uninstalled: ', JSON.stringify(event));
         const { selectedBoard } = this.boardsConfig;
         if (selectedBoard && selectedBoard.fqbn) {
-            const uninstalledBoard = event.item.boards.find(({ name }) => name === selectedBoard.name);
-            if (uninstalledBoard && uninstalledBoard.fqbn === selectedBoard.fqbn) {
-                this.logger.info(`Board package ${event.item.id} was uninstalled. Discarding the FQBN of the currently selected ${selectedBoard.name} board.`);
+            const uninstalledBoard = event.item.boards.find(
+                ({ name }) => name === selectedBoard.name
+            );
+            if (
+                uninstalledBoard &&
+                uninstalledBoard.fqbn === selectedBoard.fqbn
+            ) {
+                // We should not unset the FQBN, if the selected board is an attached, recognized board.
+                // Attach Uno and install AVR, select Uno. Uninstall the AVR core while Uno is selected. We do not want to discard the FQBN of the Uno board.
+                // Dev note: We cannot assume the `selectedBoard` is a type of `AvailableBoard`.
+                // When the user selects an `AvailableBoard` it works, but between app start/stops,
+                // it is just a FQBN, so we need to find the `selected` board among the `AvailableBoards`
+                const selectedAvailableBoard = AvailableBoard.is(selectedBoard)
+                    ? selectedBoard
+                    : this._availableBoards.find((availableBoard) =>
+                          Board.sameAs(availableBoard, selectedBoard)
+                      );
+                if (
+                    selectedAvailableBoard &&
+                    selectedAvailableBoard.selected &&
+                    selectedAvailableBoard.state ===
+                        AvailableBoard.State.recognized
+                ) {
+                    return;
+                }
+                this.logger.info(
+                    `Board package ${event.item.id} was uninstalled. Discarding the FQBN of the currently selected ${selectedBoard.name} board.`
+                );
                 const selectedBoardWithoutFqbn = {
-                    name: selectedBoard.name
+                    name: selectedBoard.name,
                     // No FQBN
                 };
                 this.boardsConfig = {
                     ...this.boardsConfig,
-                    selectedBoard: selectedBoardWithoutFqbn
+                    selectedBoard: selectedBoardWithoutFqbn,
                 };
             }
         }
     }
 
     protected async tryReconnect(): Promise<boolean> {
-        if (this.latestValidBoardsConfig && !this.canUploadTo(this.boardsConfig)) {
-            for (const board of this.availableBoards.filter(({ state }) => state !== AvailableBoard.State.incomplete)) {
-                if (this.latestValidBoardsConfig.selectedBoard.fqbn === board.fqbn
-                    && this.latestValidBoardsConfig.selectedBoard.name === board.name
-                    && Port.sameAs(this.latestValidBoardsConfig.selectedPort, board.port)) {
-
+        if (
+            this.latestValidBoardsConfig &&
+            !this.canUploadTo(this.boardsConfig)
+        ) {
+            for (const board of this.availableBoards.filter(
+                ({ state }) => state !== AvailableBoard.State.incomplete
+            )) {
+                if (
+                    this.latestValidBoardsConfig.selectedBoard.fqbn ===
+                        board.fqbn &&
+                    this.latestValidBoardsConfig.selectedBoard.name ===
+                        board.name &&
+                    Port.sameAs(
+                        this.latestValidBoardsConfig.selectedPort,
+                        board.port
+                    )
+                ) {
                     this.boardsConfig = this.latestValidBoardsConfig;
                     return true;
                 }
             }
             // If we could not find an exact match, we compare the board FQBN-name pairs and ignore the port, as it might have changed.
             // See documentation on `latestValidBoardsConfig`.
-            for (const board of this.availableBoards.filter(({ state }) => state !== AvailableBoard.State.incomplete)) {
-                if (this.latestValidBoardsConfig.selectedBoard.fqbn === board.fqbn
-                    && this.latestValidBoardsConfig.selectedBoard.name === board.name) {
-
+            for (const board of this.availableBoards.filter(
+                ({ state }) => state !== AvailableBoard.State.incomplete
+            )) {
+                if (
+                    this.latestValidBoardsConfig.selectedBoard.fqbn ===
+                        board.fqbn &&
+                    this.latestValidBoardsConfig.selectedBoard.name ===
+                        board.name
+                ) {
                     this.boardsConfig = {
                         ...this.latestValidBoardsConfig,
-                        selectedPort: board.port
+                        selectedPort: board.port,
                     };
                     return true;
                 }
@@ -181,53 +248,35 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
 
     set boardsConfig(config: BoardsConfig.Config) {
         this.doSetBoardsConfig(config);
-        this.saveState().finally(() => this.reconcileAvailableBoards().finally(() => this.onBoardsConfigChangedEmitter.fire(this._boardsConfig)));
+        this.saveState().finally(() =>
+            this.reconcileAvailableBoards().finally(() =>
+                this.onBoardsConfigChangedEmitter.fire(this._boardsConfig)
+            )
+        );
+    }
+
+    get boardsConfig(): BoardsConfig.Config {
+        return this._boardsConfig;
     }
 
     protected doSetBoardsConfig(config: BoardsConfig.Config): void {
         this.logger.info('Board config changed: ', JSON.stringify(config));
         this._boardsConfig = config;
+        this.latestBoardsConfig = this._boardsConfig;
         if (this.canUploadTo(this._boardsConfig)) {
             this.latestValidBoardsConfig = this._boardsConfig;
         }
     }
 
-    async searchBoards({ query, cores }: { query?: string, cores?: string[] }): Promise<Array<BoardWithPackage>> {
-        const boards = await this.boardsService.allBoards({});
-        const coresFilter = !!cores && cores.length
-            ? ((toFilter: BoardWithPackage) => cores.some(core => core === toFilter.packageName || core === toFilter.packageId))
-            : () => true;
-        if (!query) {
-            return boards.filter(coresFilter).sort(Board.compare);
-        }
-        const toMatch = ((toFilter: BoardWithPackage) => (({ board: toFilter, matches: monaco.filters.matchesFuzzy(query, toFilter.name, true) })));
-        const compareEntries = (left: BoardMatch, right: BoardMatch, lookFor: string) => {
-            const leftMatches = left.matches || [];
-            const rightMatches = right.matches || [];
-            if (leftMatches.length && !rightMatches.length) {
-                return -1;
-            }
-            if (!leftMatches.length && rightMatches.length) {
-                return 1;
-            }
-            if (leftMatches.length === 0 && rightMatches.length === 0) {
-                return 0;
-            }
-            const leftLabel = left.board.name.replace(/\r?\n/g, ' ');
-            const rightLabel = right.board.name.replace(/\r?\n/g, ' ');
-            return compareAnything(leftLabel, rightLabel, lookFor);
-        }
-        const normalizedQuery = query.toLowerCase();
-        return boards
-            .filter(coresFilter)
-            .map(toMatch)
-            .filter(({ matches }) => !!matches)
-            .sort((left, right) => compareEntries(left, right, normalizedQuery))
-            .map(({ board }) => board);
-    }
-
-    get boardsConfig(): BoardsConfig.Config {
-        return this._boardsConfig;
+    async searchBoards({
+        query,
+        cores,
+    }: {
+        query?: string;
+        cores?: string[];
+    }): Promise<BoardWithPackage[]> {
+        const boards = await this.boardsService.searchBoards({ query });
+        return boards;
     }
 
     /**
@@ -235,15 +284,17 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
      */
     canVerify(
         config: BoardsConfig.Config | undefined = this.boardsConfig,
-        options: { silent: boolean } = { silent: true }): config is BoardsConfig.Config & { selectedBoard: Board } {
-
+        options: { silent: boolean } = { silent: true }
+    ): config is BoardsConfig.Config & { selectedBoard: Board } {
         if (!config) {
             return false;
         }
 
         if (!config.selectedBoard) {
             if (!options.silent) {
-                this.messageService.warn('No boards selected.', { timeout: 3000 });
+                this.messageService.warn('No boards selected.', {
+                    timeout: 3000,
+                });
             }
             return false;
         }
@@ -256,8 +307,8 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
      */
     canUploadTo(
         config: BoardsConfig.Config | undefined = this.boardsConfig,
-        options: { silent: boolean } = { silent: true }): config is RecursiveRequired<BoardsConfig.Config> {
-
+        options: { silent: boolean } = { silent: true }
+    ): config is RecursiveRequired<BoardsConfig.Config> {
         if (!this.canVerify(config, options)) {
             return false;
         }
@@ -265,14 +316,20 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
         const { name } = config.selectedBoard;
         if (!config.selectedPort) {
             if (!options.silent) {
-                this.messageService.warn(`No ports selected for board: '${name}'.`, { timeout: 3000 });
+                this.messageService.warn(
+                    `No ports selected for board: '${name}'.`,
+                    { timeout: 3000 }
+                );
             }
             return false;
         }
 
         if (!config.selectedBoard.fqbn) {
             if (!options.silent) {
-                this.messageService.warn(`The FQBN is not available for the selected board ${name}. Do you have the corresponding core installed?`, { timeout: 3000 });
+                this.messageService.warn(
+                    `The FQBN is not available for the selected board ${name}. Do you have the corresponding core installed?`,
+                    { timeout: 3000 }
+                );
             }
             return false;
         }
@@ -284,25 +341,46 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
         return this._availableBoards;
     }
 
-    async waitUntilAvailable(what: Board & { port: Port }, timeout?: number): Promise<void> {
-        const find = (needle: Board & { port: Port }, haystack: AvailableBoard[]) =>
-            haystack.find(board => Board.equals(needle, board) && Port.equals(needle.port, board.port));
-        const timeoutTask = !!timeout && timeout > 0
-            ? new Promise<void>((_, reject) => setTimeout(() => reject(new Error(`Timeout after ${timeout} ms.`)), timeout))
-            : new Promise<void>(() => { /* never */ });
-        const waitUntilTask = new Promise<void>(resolve => {
+    async waitUntilAvailable(
+        what: Board & { port: Port },
+        timeout?: number
+    ): Promise<void> {
+        const find = (
+            needle: Board & { port: Port },
+            haystack: AvailableBoard[]
+        ) =>
+            haystack.find(
+                (board) =>
+                    Board.equals(needle, board) &&
+                    Port.equals(needle.port, board.port)
+            );
+        const timeoutTask =
+            !!timeout && timeout > 0
+                ? new Promise<void>((_, reject) =>
+                      setTimeout(
+                          () =>
+                              reject(new Error(`Timeout after ${timeout} ms.`)),
+                          timeout
+                      )
+                  )
+                : new Promise<void>(() => {
+                      /* never */
+                  });
+        const waitUntilTask = new Promise<void>((resolve) => {
             let candidate = find(what, this.availableBoards);
             if (candidate) {
                 resolve();
                 return;
             }
-            const disposable = this.onAvailableBoardsChanged(availableBoards => {
-                candidate = find(what, availableBoards);
-                if (candidate) {
-                    disposable.dispose();
-                    resolve();
+            const disposable = this.onAvailableBoardsChanged(
+                (availableBoards) => {
+                    candidate = find(what, availableBoards);
+                    if (candidate) {
+                        disposable.dispose();
+                        resolve();
+                    }
                 }
-            });
+            );
         });
         return await Promise.race([waitUntilTask, timeoutTask]);
     }
@@ -311,54 +389,90 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
         const attachedBoards = this._attachedBoards;
         const availablePorts = this._availablePorts;
         // Unset the port on the user's config, if it is not available anymore.
-        if (this.boardsConfig.selectedPort && !availablePorts.some(port => Port.sameAs(port, this.boardsConfig.selectedPort))) {
-            this.doSetBoardsConfig({ selectedBoard: this.boardsConfig.selectedBoard, selectedPort: undefined });
+        if (
+            this.boardsConfig.selectedPort &&
+            !availablePorts.some((port) =>
+                Port.sameAs(port, this.boardsConfig.selectedPort)
+            )
+        ) {
+            this.doSetBoardsConfig({
+                selectedBoard: this.boardsConfig.selectedBoard,
+                selectedPort: undefined,
+            });
             this.onBoardsConfigChangedEmitter.fire(this._boardsConfig);
         }
         const boardsConfig = this.boardsConfig;
         const currentAvailableBoards = this._availableBoards;
         const availableBoards: AvailableBoard[] = [];
         const availableBoardPorts = availablePorts.filter(Port.isBoardPort);
-        const attachedSerialBoards = attachedBoards.filter(({ port }) => !!port);
+        const attachedSerialBoards = attachedBoards.filter(
+            ({ port }) => !!port
+        );
 
         for (const boardPort of availableBoardPorts) {
             let state = AvailableBoard.State.incomplete; // Initial pessimism.
-            let board = attachedSerialBoards.find(({ port }) => Port.sameAs(boardPort, port));
+            let board = attachedSerialBoards.find(({ port }) =>
+                Port.sameAs(boardPort, port)
+            );
             if (board) {
                 state = AvailableBoard.State.recognized;
             } else {
                 // If the selected board is not recognized because it is a 3rd party board: https://github.com/arduino/arduino-cli/issues/623
                 // We still want to show it without the red X in the boards toolbar: https://github.com/arduino/arduino-pro-ide/issues/198#issuecomment-599355836
-                const lastSelectedBoard = await this.getLastSelectedBoardOnPort(boardPort);
+                const lastSelectedBoard = await this.getLastSelectedBoardOnPort(
+                    boardPort
+                );
                 if (lastSelectedBoard) {
                     board = {
                         ...lastSelectedBoard,
-                        port: boardPort
+                        port: boardPort,
                     };
                     state = AvailableBoard.State.guessed;
                 }
             }
             if (!board) {
-                availableBoards.push({ name: 'Unknown', port: boardPort, state });
+                availableBoards.push({
+                    name: 'Unknown',
+                    port: boardPort,
+                    state,
+                });
             } else {
-                const selected = BoardsConfig.Config.sameAs(boardsConfig, board);
-                availableBoards.push({ ...board, state, selected, port: boardPort });
+                const selected = BoardsConfig.Config.sameAs(
+                    boardsConfig,
+                    board
+                );
+                availableBoards.push({
+                    ...board,
+                    state,
+                    selected,
+                    port: boardPort,
+                });
             }
         }
 
-        if (boardsConfig.selectedBoard && !availableBoards.some(({ selected }) => selected)) {
+        if (
+            boardsConfig.selectedBoard &&
+            !availableBoards.some(({ selected }) => selected)
+        ) {
             availableBoards.push({
                 ...boardsConfig.selectedBoard,
                 port: boardsConfig.selectedPort,
                 selected: true,
-                state: AvailableBoard.State.incomplete
+                state: AvailableBoard.State.incomplete,
             });
         }
 
-        const sortedAvailableBoards = availableBoards.sort(AvailableBoard.compare);
-        let hasChanged = sortedAvailableBoards.length !== currentAvailableBoards.length;
+        const sortedAvailableBoards = availableBoards.sort(
+            AvailableBoard.compare
+        );
+        let hasChanged =
+            sortedAvailableBoards.length !== currentAvailableBoards.length;
         for (let i = 0; !hasChanged && i < sortedAvailableBoards.length; i++) {
-            hasChanged = AvailableBoard.compare(sortedAvailableBoards[i], currentAvailableBoards[i]) !== 0;
+            hasChanged =
+                AvailableBoard.compare(
+                    sortedAvailableBoards[i],
+                    currentAvailableBoards[i]
+                ) !== 0;
         }
         if (hasChanged) {
             this._availableBoards = sortedAvailableBoards;
@@ -366,12 +480,14 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
         }
     }
 
-    protected async getLastSelectedBoardOnPort(port: Port | string | undefined): Promise<Board | undefined> {
+    protected async getLastSelectedBoardOnPort(
+        port: Port | string | undefined
+    ): Promise<Board | undefined> {
         if (!port) {
             return undefined;
         }
         const key = this.getLastSelectedBoardOnPortKey(port);
-        return this.storageService.getData<Board>(key);
+        return this.getData<Board>(key);
     }
 
     protected async saveState(): Promise<void> {
@@ -382,26 +498,65 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
         const { selectedBoard, selectedPort } = this.boardsConfig;
         if (selectedBoard && selectedPort) {
             const key = this.getLastSelectedBoardOnPortKey(selectedPort);
-            await this.storageService.setData(key, selectedBoard);
+            await this.setData(key, selectedBoard);
         }
-        await this.storageService.setData('latest-valid-boards-config', this.latestValidBoardsConfig);
+        await Promise.all([
+            this.setData(
+                'latest-valid-boards-config',
+                this.latestValidBoardsConfig
+            ),
+            this.setData('latest-boards-config', this.latestBoardsConfig),
+        ]);
     }
 
     protected getLastSelectedBoardOnPortKey(port: Port | string): string {
         // TODO: we lose the port's `protocol` info (`serial`, `network`, etc.) here if the `port` is a `string`.
-        return `last-selected-board-on-port:${typeof port === 'string' ? port : Port.toString(port)}`;
+        return `last-selected-board-on-port:${
+            typeof port === 'string' ? port : Port.toString(port)
+        }`;
     }
 
     protected async loadState(): Promise<void> {
-        const storedValidBoardsConfig = await this.storageService.getData<RecursiveRequired<BoardsConfig.Config>>('latest-valid-boards-config');
-        if (storedValidBoardsConfig) {
-            this.latestValidBoardsConfig = storedValidBoardsConfig;
+        const storedLatestValidBoardsConfig = await this.getData<
+            RecursiveRequired<BoardsConfig.Config>
+        >('latest-valid-boards-config');
+        if (storedLatestValidBoardsConfig) {
+            this.latestValidBoardsConfig = storedLatestValidBoardsConfig;
             if (this.canUploadTo(this.latestValidBoardsConfig)) {
                 this.boardsConfig = this.latestValidBoardsConfig;
             }
+        } else {
+            // If we could not restore the latest valid config, try to restore something, the board at least.
+            let storedLatestBoardsConfig = await this.getData<
+                BoardsConfig.Config | undefined
+            >('latest-boards-config');
+            // Try to get from the URL if it was not persisted.
+            if (!storedLatestBoardsConfig) {
+                storedLatestBoardsConfig = BoardsConfig.Config.getConfig(
+                    new URL(window.location.href)
+                );
+            }
+            if (storedLatestBoardsConfig) {
+                this.latestBoardsConfig = storedLatestBoardsConfig;
+                this.boardsConfig = this.latestBoardsConfig;
+            }
         }
     }
 
+    private setData<T>(key: string, value: T): Promise<void> {
+        return this.commandService.executeCommand(
+            StorageWrapper.Commands.SET_DATA.id,
+            key,
+            value
+        );
+    }
+
+    private getData<T>(key: string): Promise<T | undefined> {
+        return this.commandService.executeCommand<T>(
+            StorageWrapper.Commands.GET_DATA.id,
+            key
+        );
+    }
 }
 
 /**
@@ -417,7 +572,6 @@ export interface AvailableBoard extends Board {
 }
 
 export namespace AvailableBoard {
-
     export enum State {
         /**
          * Retrieved from the CLI via the `board list` command.
@@ -430,14 +584,16 @@ export namespace AvailableBoard {
         /**
          * We do not know anything about this board, probably a 3rd party. The user has not selected a board for this port yet.
          */
-        'incomplete'
+        'incomplete',
     }
 
     export function is(board: any): board is AvailableBoard {
         return Board.is(board) && 'state' in board;
     }
 
-    export function hasPort(board: AvailableBoard): board is AvailableBoard & { port: Port } {
+    export function hasPort(
+        board: AvailableBoard
+    ): board is AvailableBoard & { port: Port } {
         return !!board.port;
     }
 
@@ -471,6 +627,5 @@ export namespace AvailableBoard {
             return 1;
         }
         return left.state - right.state;
-    }
-
+    };
 }

arduino-ide-extension/src/browser/boards/boards-toolbar-item.tsx

@@ -5,7 +5,10 @@ import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Port } from '../../common/protocol';
 import { BoardsConfig } from './boards-config';
 import { ArduinoCommands } from '../arduino-commands';
-import { BoardsServiceProvider, AvailableBoard } from './boards-service-provider';
+import {
+    BoardsServiceProvider,
+    AvailableBoard,
+} from './boards-service-provider';
 
 export interface BoardsDropDownListCoords {
     readonly top: number;
@@ -17,13 +20,14 @@ export interface BoardsDropDownListCoords {
 export namespace BoardsDropDown {
     export interface Props {
         readonly coords: BoardsDropDownListCoords | 'hidden';
-        readonly items: Array<AvailableBoard & { onClick: () => void, port: Port }>;
+        readonly items: Array<
+            AvailableBoard & { onClick: () => void; port: Port }
+        >;
         readonly openBoardsConfig: () => void;
     }
 }
 
 export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
-
     protected dropdownElement: HTMLElement;
 
     constructor(props: BoardsDropDown.Props) {
@@ -47,35 +51,61 @@ export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
         if (coords === 'hidden') {
             return '';
         }
-        return <div className='arduino-boards-dropdown-list'
-            style={{
-                position: 'absolute',
-                ...coords
-            }}>
-            {this.renderItem({
-                label: 'Select Other Board & Port',
-                onClick: () => this.props.openBoardsConfig()
-            })}
-            {items.map(({ name, port, selected, onClick }) => ({ label: `${name} at ${Port.toString(port)}`, selected, onClick })).map(this.renderItem)}
-        </div>
-    }
-
-    protected renderItem({ label, selected, onClick }: { label: string, selected?: boolean, onClick: () => void }): React.ReactNode {
-        return <div key={label} className={`arduino-boards-dropdown-item ${selected ? 'selected' : ''}`} onClick={onClick}>
-            <div>
-                {label}
+        return (
+            <div
+                className="arduino-boards-dropdown-list"
+                style={{
+                    position: 'absolute',
+                    ...coords,
+                }}
+            >
+                {this.renderItem({
+                    label: 'Select Other Board & Port',
+                    onClick: () => this.props.openBoardsConfig(),
+                })}
+                {items
+                    .map(({ name, port, selected, onClick }) => ({
+                        label: `${name} at ${Port.toString(port)}`,
+                        selected,
+                        onClick,
+                    }))
+                    .map(this.renderItem)}
             </div>
-            {selected ? <span className='fa fa-check' /> : ''}
-        </div>
+        );
     }
 
+    protected renderItem({
+        label,
+        selected,
+        onClick,
+    }: {
+        label: string;
+        selected?: boolean;
+        onClick: () => void;
+    }): React.ReactNode {
+        return (
+            <div
+                key={label}
+                className={`arduino-boards-dropdown-item ${
+                    selected ? 'selected' : ''
+                }`}
+                onClick={onClick}
+            >
+                <div>{label}</div>
+                {selected ? <span className="fa fa-check" /> : ''}
+            </div>
+        );
+    }
 }
 
-export class BoardsToolBarItem extends React.Component<BoardsToolBarItem.Props, BoardsToolBarItem.State> {
-
+export class BoardsToolBarItem extends React.Component<
+    BoardsToolBarItem.Props,
+    BoardsToolBarItem.State
+> {
     static TOOLBAR_ID: 'boards-toolbar';
 
-    protected readonly toDispose: DisposableCollection = new DisposableCollection();
+    protected readonly toDispose: DisposableCollection =
+        new DisposableCollection();
 
     constructor(props: BoardsToolBarItem.Props) {
         super(props);
@@ -83,7 +113,7 @@ export class BoardsToolBarItem extends React.Component<BoardsToolBarItem.Props,
         const { availableBoards } = props.boardsServiceClient;
         this.state = {
             availableBoards,
-            coords: 'hidden'
+            coords: 'hidden',
         };
 
         document.addEventListener('click', () => {
@@ -92,7 +122,9 @@ export class BoardsToolBarItem extends React.Component<BoardsToolBarItem.Props,
     }
 
     componentDidMount() {
-        this.props.boardsServiceClient.onAvailableBoardsChanged(availableBoards => this.setState({ availableBoards }));
+        this.props.boardsServiceClient.onAvailableBoardsChanged(
+            (availableBoards) => this.setState({ availableBoards })
+        );
     }
 
     componentWillUnmount(): void {
@@ -109,8 +141,8 @@ export class BoardsToolBarItem extends React.Component<BoardsToolBarItem.Props,
                         top: rect.top,
                         left: rect.left,
                         width: rect.width,
-                        paddingTop: rect.height
-                    }
+                        paddingTop: rect.height,
+                    },
                 });
             } else {
                 this.setState({ coords: 'hidden' });
@@ -123,63 +155,76 @@ export class BoardsToolBarItem extends React.Component<BoardsToolBarItem.Props,
     render(): React.ReactNode {
         const { coords, availableBoards } = this.state;
         const boardsConfig = this.props.boardsServiceClient.boardsConfig;
-        const title = BoardsConfig.Config.toString(boardsConfig, { default: 'no board selected' });
+        const title = BoardsConfig.Config.toString(boardsConfig, {
+            default: 'no board selected',
+        });
         const decorator = (() => {
-            const selectedBoard = availableBoards.find(({ selected }) => selected);
+            const selectedBoard = availableBoards.find(
+                ({ selected }) => selected
+            );
             if (!selectedBoard || !selectedBoard.port) {
-                return 'fa fa-times notAttached'
+                return 'fa fa-times notAttached';
             }
             if (selectedBoard.state === AvailableBoard.State.guessed) {
-                return 'fa fa-exclamation-triangle guessed'
+                return 'fa fa-exclamation-triangle guessed';
             }
-            return ''
+            return '';
         })();
 
-        return <React.Fragment>
-            <div className='arduino-boards-toolbar-item-container'>
-                <div className='arduino-boards-toolbar-item' title={title}>
-                    <div className='inner-container' onClick={this.show}>
-                        <span className={decorator} />
-                        <div className='label noWrapInfo'>
-                            <div className='noWrapInfo noselect'>
-                                {title}
+        return (
+            <React.Fragment>
+                <div className="arduino-boards-toolbar-item-container">
+                    <div className="arduino-boards-toolbar-item" title={title}>
+                        <div className="inner-container" onClick={this.show}>
+                            <span className={decorator} />
+                            <div className="label noWrapInfo">
+                                <div className="noWrapInfo noselect">
+                                    {title}
+                                </div>
                             </div>
+                            <span className="fa fa-caret-down caret" />
                         </div>
-                        <span className='fa fa-caret-down caret' />
                     </div>
                 </div>
-            </div>
-            <BoardsDropDown
-                coords={coords}
-                items={availableBoards.filter(AvailableBoard.hasPort).map(board => ({
-                    ...board,
-                    onClick: () => {
-                        if (board.state === AvailableBoard.State.incomplete) {
-                            this.props.boardsServiceClient.boardsConfig = {
-                                selectedPort: board.port
-                            };
-                            this.openDialog();
-                        } else {
-                            this.props.boardsServiceClient.boardsConfig = {
-                                selectedBoard: board,
-                                selectedPort: board.port
-                            }
-                        }
-                    }
-                }))}
-                openBoardsConfig={this.openDialog}>
-            </BoardsDropDown>
-        </React.Fragment>;
+                <BoardsDropDown
+                    coords={coords}
+                    items={availableBoards
+                        .filter(AvailableBoard.hasPort)
+                        .map((board) => ({
+                            ...board,
+                            onClick: () => {
+                                if (
+                                    board.state ===
+                                    AvailableBoard.State.incomplete
+                                ) {
+                                    this.props.boardsServiceClient.boardsConfig =
+                                        {
+                                            selectedPort: board.port,
+                                        };
+                                    this.openDialog();
+                                } else {
+                                    this.props.boardsServiceClient.boardsConfig =
+                                        {
+                                            selectedBoard: board,
+                                            selectedPort: board.port,
+                                        };
+                                }
+                            },
+                        }))}
+                    openBoardsConfig={this.openDialog}
+                ></BoardsDropDown>
+            </React.Fragment>
+        );
     }
 
     protected openDialog = () => {
-        this.props.commands.executeCommand(ArduinoCommands.OPEN_BOARDS_DIALOG.id);
+        this.props.commands.executeCommand(
+            ArduinoCommands.OPEN_BOARDS_DIALOG.id
+        );
         this.setState({ coords: 'hidden' });
     };
-
 }
 export namespace BoardsToolBarItem {
-
     export interface Props {
         readonly boardsServiceClient: BoardsServiceProvider;
         readonly commands: CommandRegistry;
@@ -189,5 +234,4 @@ export namespace BoardsToolBarItem {
         availableBoards: AvailableBoard[];
         coords: BoardsDropDownListCoords | 'hidden';
     }
-
 }

arduino-ide-extension/src/browser/boards/boards-widget-frontend-contribution.ts

@@ -1,40 +1,24 @@
 import { injectable } from 'inversify';
-import { MenuModelRegistry } from '@theia/core';
 import { BoardsListWidget } from './boards-list-widget';
 import { BoardsPackage } from '../../common/protocol/boards-service';
 import { ListWidgetFrontendContribution } from '../widgets/component-list/list-widget-frontend-contribution';
-import { ArduinoMenus } from '../menu/arduino-menus';
 
 @injectable()
 export class BoardsListWidgetFrontendContribution extends ListWidgetFrontendContribution<BoardsPackage> {
-
-    static readonly OPEN_MANAGER = `${BoardsListWidget.WIDGET_ID}:toggle`;
-
     constructor() {
         super({
             widgetId: BoardsListWidget.WIDGET_ID,
             widgetName: BoardsListWidget.WIDGET_LABEL,
             defaultWidgetOptions: {
                 area: 'left',
-                rank: 600
+                rank: 2,
             },
-            toggleCommandId: BoardsListWidgetFrontendContribution.OPEN_MANAGER,
-            toggleKeybinding: 'CtrlCmd+Shift+B'
+            toggleCommandId: `${BoardsListWidget.WIDGET_ID}:toggle`,
+            toggleKeybinding: 'CtrlCmd+Shift+B',
         });
     }
 
     async initializeLayout(): Promise<void> {
         this.openView();
     }
-
-    registerMenus(menus: MenuModelRegistry): void {
-        if (this.toggleCommand) {
-            menus.registerMenuAction(ArduinoMenus.TOOLS__MAIN_GROUP, {
-                commandId: this.toggleCommand.id,
-                label: 'Boards Manager...',
-                order: '4'
-            });
-        }
-    }
-
 }

arduino-ide-extension/src/browser/boards/quick-open/boards-quick-open-module.ts

@@ -1,16 +0,0 @@
-import { ContainerModule } from 'inversify';
-import { ILogger } from '@theia/core/lib/common/logger';
-import { CommandContribution } from '@theia/core/lib/common/command';
-import { QuickOpenContribution } from '@theia/core/lib/browser/quick-open';
-import { KeybindingContribution } from '@theia/core/lib/browser/keybinding';
-import { BoardsQuickOpenService } from './boards-quick-open-service';
-
-export default new ContainerModule(bind => {
-    bind(BoardsQuickOpenService).toSelf().inSingletonScope();
-    bind(CommandContribution).toService(BoardsQuickOpenService);
-    bind(KeybindingContribution).toService(BoardsQuickOpenService);
-    bind(QuickOpenContribution).toService(BoardsQuickOpenService);
-    bind(ILogger).toDynamicValue(({ container }) => container.get<ILogger>(ILogger).child('boards-quick-open'))
-        .inSingletonScope()
-        .whenTargetNamed('boards-quick-open');
-});

arduino-ide-extension/src/browser/boards/quick-open/boards-quick-open-service.ts

@@ -1,309 +0,0 @@
-import * as fuzzy from 'fuzzy';
-import { inject, injectable, postConstruct, named } from 'inversify';
-import { ILogger } from '@theia/core/lib/common/logger';
-import { CommandContribution, CommandRegistry, Command } from '@theia/core/lib/common/command';
-import { KeybindingContribution, KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
-import { QuickOpenItem, QuickOpenModel, QuickOpenMode, QuickOpenGroupItem } from '@theia/core/lib/common/quick-open-model';
-import {
-    QuickOpenService,
-    QuickOpenHandler,
-    QuickOpenOptions,
-    QuickOpenItemOptions,
-    QuickOpenContribution,
-    QuickOpenActionProvider,
-    QuickOpenHandlerRegistry,
-    QuickOpenGroupItemOptions
-} from '@theia/core/lib/browser/quick-open';
-import { naturalCompare } from '../../../common/utils';
-import { BoardsService, Port, Board, ConfigOption, ConfigValue } from '../../../common/protocol';
-import { BoardsDataStore } from '../boards-data-store';
-import { BoardsServiceProvider, AvailableBoard } from '../boards-service-provider';
-import { NotificationCenter } from '../../notification-center';
-
-@injectable()
-export class BoardsQuickOpenService implements QuickOpenContribution, QuickOpenModel, QuickOpenHandler, CommandContribution, KeybindingContribution, Command {
-
-    readonly id = 'arduino-boards-quick-open';
-    readonly prefix = '|';
-    readonly description = 'Configure Available Boards';
-    readonly label: 'Configure Available Boards';
-
-    @inject(ILogger)
-    @named('boards-quick-open')
-    protected readonly logger: ILogger;
-
-    @inject(QuickOpenService)
-    protected readonly quickOpenService: QuickOpenService;
-
-    @inject(BoardsService)
-    protected readonly boardsService: BoardsService;
-
-    @inject(BoardsServiceProvider)
-    protected readonly boardsServiceClient: BoardsServiceProvider;
-
-    @inject(BoardsDataStore)
-    protected readonly boardsDataStore: BoardsDataStore;
-
-    @inject(NotificationCenter)
-    protected notificationCenter: NotificationCenter;
-
-    protected isOpen: boolean = false;
-    protected currentQuery: string = '';
-    // Attached boards plus the user's config.
-    protected availableBoards: AvailableBoard[] = [];
-    // Only for the `selected` one from the `availableBoards`. Note: the `port` of the `selected` is optional.
-    protected data: BoardsDataStore.Data = BoardsDataStore.Data.EMPTY;
-    protected allBoards: Board.Detailed[] = []
-    protected selectedBoard?: (AvailableBoard & { port: Port });
-
-    // `init` name is used by the `QuickOpenHandler`.
-    @postConstruct()
-    protected postConstruct(): void {
-        this.notificationCenter.onIndexUpdated(() => this.update(this.availableBoards));
-        this.boardsServiceClient.onAvailableBoardsChanged(availableBoards => this.update(availableBoards));
-        this.update(this.boardsServiceClient.availableBoards);
-    }
-
-    registerCommands(registry: CommandRegistry): void {
-        registry.registerCommand(this, { execute: () => this.open() });
-    }
-
-    registerKeybindings(registry: KeybindingRegistry): void {
-        registry.registerKeybinding({ command: this.id, keybinding: 'ctrlCmd+k ctrlCmd+b' });
-    }
-
-    registerQuickOpenHandlers(registry: QuickOpenHandlerRegistry): void {
-        registry.registerHandler(this);
-    }
-
-    getModel(): QuickOpenModel {
-        return this;
-    }
-
-    getOptions(): QuickOpenOptions {
-        let placeholder = '';
-        if (!this.selectedBoard) {
-            placeholder += 'No board selected.';
-        }
-        placeholder += 'Type to filter boards';
-        if (this.data.configOptions.length) {
-            placeholder += ' or use the ↓↑ keys to adjust the board settings...';
-        } else {
-            placeholder += '...';
-        }
-        return {
-            placeholder,
-            fuzzyMatchLabel: true,
-            onClose: () => this.isOpen = false
-        };
-    }
-
-    open(): void {
-        this.isOpen = true;
-        this.quickOpenService.open(this, this.getOptions());
-    }
-
-    onType(
-        lookFor: string,
-        acceptor: (items: QuickOpenItem<QuickOpenItemOptions>[], actionProvider?: QuickOpenActionProvider) => void): void {
-
-        this.currentQuery = lookFor;
-        const fuzzyFilter = this.fuzzyFilter(lookFor);
-        const availableBoards = this.availableBoards.filter(AvailableBoard.hasPort).filter(({ name }) => fuzzyFilter(name));
-        const toAccept: QuickOpenItem<QuickOpenItemOptions>[] = [];
-
-        // Show the selected attached in a different group.
-        if (this.selectedBoard && fuzzyFilter(this.selectedBoard.name)) {
-            toAccept.push(this.toQuickItem(this.selectedBoard, { groupLabel: 'Selected Board' }));
-        }
-
-        // Filter the selected from the attached ones.
-        toAccept.push(...availableBoards.filter(board => board !== this.selectedBoard).map((board, i) => {
-            let group: QuickOpenGroupItemOptions | undefined = undefined;
-            if (i === 0) {
-                // If no `selectedBoard`, then this item is the top one, no borders required.
-                group = { groupLabel: 'Attached Boards', showBorder: !!this.selectedBoard };
-            }
-            return this.toQuickItem(board, group);
-        }));
-
-        // Show the config only if the `input` is empty.
-        if (!lookFor.trim().length) {
-            toAccept.push(...this.data.configOptions.map((config, i) => {
-                let group: QuickOpenGroupItemOptions | undefined = undefined;
-                if (i === 0) {
-                    group = { groupLabel: 'Board Settings', showBorder: true };
-                }
-                return this.toQuickItem(config, group);
-            }));
-        } else {
-            toAccept.push(...this.allBoards.filter(({ name }) => fuzzyFilter(name)).map((board, i) => {
-                let group: QuickOpenGroupItemOptions | undefined = undefined;
-                if (i === 0) {
-                    group = { groupLabel: 'Boards', showBorder: true };
-                }
-                return this.toQuickItem(board, group);
-            }));
-        }
-
-        acceptor(toAccept);
-    }
-
-    private fuzzyFilter(lookFor: string): (inputString: string) => boolean {
-        const shouldFilter = !!lookFor.trim().length;
-        return (inputString: string) => shouldFilter ? fuzzy.test(lookFor.toLocaleLowerCase(), inputString.toLocaleLowerCase()) : true;
-    }
-
-    protected async update(availableBoards: AvailableBoard[]): Promise<void> {
-        // `selectedBoard` is not an attached board, we need to show the board settings for it (TODO: clarify!)
-        const selectedBoard = availableBoards.filter(AvailableBoard.hasPort).find(({ selected }) => selected);
-        const [data, boards] = await Promise.all([
-            selectedBoard && selectedBoard.fqbn ? this.boardsDataStore.getData(selectedBoard.fqbn) : Promise.resolve(BoardsDataStore.Data.EMPTY),
-            this.boardsService.allBoards({})
-        ]);
-        this.allBoards = Board.decorateBoards(selectedBoard, boards)
-            .filter(board => !availableBoards.some(availableBoard => Board.sameAs(availableBoard, board)));
-        this.availableBoards = availableBoards;
-        this.data = data;
-        this.selectedBoard = selectedBoard;
-
-        if (this.isOpen) {
-            // Hack, to update the state without closing and reopening the quick open widget.
-            (this.quickOpenService as any).onType(this.currentQuery);
-        }
-    }
-
-    protected toQuickItem(item: BoardsQuickOpenService.Item, group?: QuickOpenGroupItemOptions): QuickOpenItem<QuickOpenItemOptions> {
-        let options: QuickOpenItemOptions;
-        if (AvailableBoard.is(item)) {
-            const description = `on ${Port.toString(item.port)}`
-            options = {
-                label: `${item.name}`,
-                description,
-                descriptionHighlights: [
-                    {
-                        start: 0,
-                        end: description.length
-                    }
-                ],
-                run: this.toRun(() => this.boardsServiceClient.boardsConfig = ({ selectedBoard: item, selectedPort: item.port }))
-            };
-        } else if (ConfigOption.is(item)) {
-            const selected = item.values.find(({ selected }) => selected);
-            const value = selected ? selected.label : 'Not set';
-            const label = `${item.label}: ${value}`;
-            options = {
-                label,
-                // Intended to match the value part of a board setting.
-                // NOTE: this does not work, as `fuzzyMatchLabel: true` is set. Manual highlighting is ignored, apparently.
-                labelHighlights: [
-                    {
-                        start: label.length - value.length,
-                        end: label.length
-                    }
-                ],
-                run: (mode) => {
-                    if (mode === QuickOpenMode.OPEN) {
-                        this.setConfig(item);
-                        return false;
-                    }
-                    return true;
-                }
-            };
-            if (!selected) {
-                options.description = 'Not set';
-            };
-        } else {
-            options = {
-                label: `${item.name}`,
-                description: `${item.missing ? '' : `[installed with '${item.packageName}']`}`,
-                run: (mode) => {
-                    if (mode === QuickOpenMode.OPEN) {
-                        this.selectBoard(item);
-                        return false;
-                    }
-                    return true;
-                }
-            };
-        }
-        if (group) {
-            return new QuickOpenGroupItem<QuickOpenGroupItemOptions>({ ...options, ...group });
-        } else {
-            return new QuickOpenItem<QuickOpenItemOptions>(options);
-        }
-    }
-
-    protected toRun(run: (() => void)): ((mode: QuickOpenMode) => boolean) {
-        return (mode) => {
-            if (mode !== QuickOpenMode.OPEN) {
-                return false;
-            }
-            run();
-            return true;
-        };
-    }
-
-    protected async selectBoard(board: Board): Promise<void> {
-        const allPorts = this.availableBoards.filter(AvailableBoard.hasPort).map(({ port }) => port).sort(Port.compare);
-        const toItem = (port: Port) => new QuickOpenItem<QuickOpenItemOptions>({
-            label: Port.toString(port, { useLabel: true }),
-            run: this.toRun(() => {
-                this.boardsServiceClient.boardsConfig = {
-                    selectedBoard: board,
-                    selectedPort: port
-                };
-            })
-        });
-        const options = {
-            placeholder: `Select a port for '${board.name}'. Press 'Enter' to confirm or 'Escape' to cancel.`,
-            fuzzyMatchLabel: true
-        }
-        this.quickOpenService.open({
-            onType: (lookFor, acceptor) => {
-                const fuzzyFilter = this.fuzzyFilter(lookFor);
-                acceptor(allPorts.filter(({ address }) => fuzzyFilter(address)).map(toItem));
-            }
-        }, options);
-    }
-
-    protected async setConfig(config: ConfigOption): Promise<void> {
-        const toItem = (value: ConfigValue) => new QuickOpenItem<QuickOpenItemOptions>({
-            label: value.label,
-            iconClass: value.selected ? 'fa fa-check' : '',
-            run: this.toRun(() => {
-                if (!this.selectedBoard) {
-                    this.logger.warn(`Could not alter the boards settings. No board selected. ${JSON.stringify(config)}`);
-                    return;
-                }
-                if (!this.selectedBoard.fqbn) {
-                    this.logger.warn(`Could not alter the boards settings. The selected board does not have a FQBN. ${JSON.stringify(this.selectedBoard)}`);
-                    return;
-                }
-                const { fqbn } = this.selectedBoard;
-                this.boardsDataStore.selectConfigOption({
-                    fqbn,
-                    option: config.option,
-                    selectedValue: value.value
-                });
-            })
-        });
-        const options = {
-            placeholder: `Configure '${config.label}'. Press 'Enter' to confirm or 'Escape' to cancel.`,
-            fuzzyMatchLabel: true
-        }
-        this.quickOpenService.open({
-            onType: (lookFor, acceptor) => {
-                const fuzzyFilter = this.fuzzyFilter(lookFor);
-                acceptor(config.values
-                    .filter(({ label }) => fuzzyFilter(label))
-                    .sort((left, right) => naturalCompare(left.label, right.label))
-                    .map(toItem));
-            }
-        }, options);
-    }
-
-}
-
-export namespace BoardsQuickOpenService {
-    export type Item = AvailableBoard & { port: Port } | Board.Detailed | ConfigOption;
-}

arduino-ide-extension/src/browser/contributions/about.ts

@@ -4,13 +4,17 @@ import { remote } from 'electron';
 import { isOSX, isWindows } from '@theia/core/lib/common/os';
 import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
 import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
-import { Contribution, Command, MenuModelRegistry, CommandRegistry } from './contribution';
+import {
+    Contribution,
+    Command,
+    MenuModelRegistry,
+    CommandRegistry,
+} from './contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { ConfigService } from '../../common/protocol';
 
 @injectable()
 export class About extends Contribution {
-
     @inject(ClipboardService)
     protected readonly clipboardService: ClipboardService;
 
@@ -19,46 +23,54 @@ export class About extends Contribution {
 
     registerCommands(registry: CommandRegistry): void {
         registry.registerCommand(About.Commands.ABOUT_APP, {
-            execute: () => this.showAbout()
+            execute: () => this.showAbout(),
         });
     }
 
     registerMenus(registry: MenuModelRegistry): void {
-        // On macOS we will get the `Quit ${YOUR_APP_NAME}` menu item natively, no need to duplicate it. 
         registry.registerMenuAction(ArduinoMenus.HELP__ABOUT_GROUP, {
             commandId: About.Commands.ABOUT_APP.id,
-            label: `About${isOSX ? ` ${this.applicationName}` : ''}`,
-            order: '0'
+            label: `About ${this.applicationName}`,
+            order: '0',
         });
     }
 
     async showAbout(): Promise<void> {
-        const ideStatus = FrontendApplicationConfigProvider.get()['status'];
-        const { version, commit, status: cliStatus } = await this.configService.getVersion();
+        const {
+            version,
+            commit,
+            status: cliStatus,
+        } = await this.configService.getVersion();
         const buildDate = this.buildDate;
-        const detail = (useAgo: boolean) => `
-Version: ${remote.app.getVersion()}
-Date: ${buildDate ? buildDate : 'dev build'}${buildDate && useAgo ? ` (${this.ago(buildDate)})` : ''}
+        const detail = (
+            showAll: boolean
+        ) => `Version: ${remote.app.getVersion()}
+Date: ${buildDate ? buildDate : 'dev build'}${
+            buildDate && showAll ? ` (${this.ago(buildDate)})` : ''
+        }
 CLI Version: ${version}${cliStatus ? ` ${cliStatus}` : ''} [${commit}]
 
-Copyright © ${new Date().getFullYear()} Arduino SA 
+${showAll ? `Copyright © ${new Date().getFullYear()} Arduino SA` : ''}
 `;
         const ok = 'OK';
         const copy = 'Copy';
         const buttons = !isWindows && !isOSX ? [copy, ok] : [ok, copy];
-        const { response } = await remote.dialog.showMessageBox(remote.getCurrentWindow(), {
-            message: `${this.applicationName}${ideStatus ? ` – ${ideStatus}` : ''}`,
-            title: `${this.applicationName}${ideStatus ? ` – ${ideStatus}` : ''}`,
-            type: 'info',
-            detail: detail(true),
-            buttons,
-            noLink: true,
-            defaultId: buttons.indexOf(ok),
-            cancelId: buttons.indexOf(ok)
-        });
+        const { response } = await remote.dialog.showMessageBox(
+            remote.getCurrentWindow(),
+            {
+                message: `${this.applicationName}`,
+                title: `${this.applicationName}`,
+                type: 'info',
+                detail: detail(true),
+                buttons,
+                noLink: true,
+                defaultId: buttons.indexOf(ok),
+                cancelId: buttons.indexOf(ok),
+            }
+        );
 
         if (buttons[response] === copy) {
-            await this.clipboardService.writeText(detail(false));
+            await this.clipboardService.writeText(detail(false).trim());
         }
     }
 
@@ -75,7 +87,9 @@ Copyright © ${new Date().getFullYear()} Arduino SA
         const other = moment(isoTime);
         let result = now.diff(other, 'minute');
         if (result < 60) {
-            return result === 1 ? `${result} minute ago` : `${result} minute ago`;
+            return result === 1
+                ? `${result} minute ago`
+                : `${result} minute ago`;
         }
         result = now.diff(other, 'hour');
         if (result < 25) {
@@ -91,18 +105,19 @@ Copyright © ${new Date().getFullYear()} Arduino SA
         }
         result = now.diff(other, 'month');
         if (result < 13) {
-            return result === 1 ? `${result} month ago` : `${result} months ago`;
+            return result === 1
+                ? `${result} month ago`
+                : `${result} months ago`;
         }
         result = now.diff(other, 'year');
         return result === 1 ? `${result} year ago` : `${result} years ago`;
     }
-
 }
 
 export namespace About {
     export namespace Commands {
         export const ABOUT_APP: Command = {
-            id: 'arduino-about'
+            id: 'arduino-about',
         };
     }
 }

arduino-ide-extension/src/browser/contributions/add-file.ts

@@ -0,0 +1,75 @@
+import { inject, injectable } from 'inversify';
+import { remote } from 'electron';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import {
+    SketchContribution,
+    Command,
+    CommandRegistry,
+    MenuModelRegistry,
+    URI,
+} from './contribution';
+import { FileDialogService } from '@theia/filesystem/lib/browser';
+
+@injectable()
+export class AddFile extends SketchContribution {
+    @inject(FileDialogService)
+    protected readonly fileDialogService: FileDialogService;
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(AddFile.Commands.ADD_FILE, {
+            execute: () => this.addFile(),
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.SKETCH__UTILS_GROUP, {
+            commandId: AddFile.Commands.ADD_FILE.id,
+            label: 'Add File...',
+            order: '2',
+        });
+    }
+
+    protected async addFile(): Promise<void> {
+        const sketch = await this.sketchServiceClient.currentSketch();
+        if (!sketch) {
+            return;
+        }
+        const toAddUri = await this.fileDialogService.showOpenDialog({
+            title: 'Add File',
+            canSelectFiles: true,
+            canSelectFolders: false,
+            canSelectMany: false,
+        });
+        if (!toAddUri) {
+            return;
+        }
+        const sketchUri = new URI(sketch.uri);
+        const filename = toAddUri.path.base;
+        const targetUri = sketchUri.resolve('data').resolve(filename);
+        const exists = await this.fileService.exists(targetUri);
+        if (exists) {
+            const { response } = await remote.dialog.showMessageBox({
+                type: 'question',
+                title: 'Replace',
+                buttons: ['Cancel', 'OK'],
+                message: `Replace the existing version of ${filename}?`,
+            });
+            if (response === 0) {
+                // Cancel
+                return;
+            }
+        }
+        await this.fileService.copy(toAddUri, targetUri, { overwrite: true });
+        this.messageService.info('One file added to the sketch.', {
+            timeout: 2000,
+        });
+    }
+}
+
+export namespace AddFile {
+    export namespace Commands {
+        export const ADD_FILE: Command = {
+            id: 'arduino-add-file',
+        };
+    }
+}

arduino-ide-extension/src/browser/contributions/add-zip-library.ts

@@ -0,0 +1,139 @@
+import { inject, injectable } from 'inversify';
+import { remote } from 'electron';
+import URI from '@theia/core/lib/common/uri';
+import { ConfirmDialog } from '@theia/core/lib/browser/dialogs';
+import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import { ResponseServiceImpl } from '../response-service-impl';
+import { Installable, LibraryService } from '../../common/protocol';
+import {
+    SketchContribution,
+    Command,
+    CommandRegistry,
+    MenuModelRegistry,
+} from './contribution';
+
+@injectable()
+export class AddZipLibrary extends SketchContribution {
+    @inject(EnvVariablesServer)
+    protected readonly envVariableServer: EnvVariablesServer;
+
+    @inject(ResponseServiceImpl)
+    protected readonly responseService: ResponseServiceImpl;
+
+    @inject(LibraryService)
+    protected readonly libraryService: LibraryService;
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(AddZipLibrary.Commands.ADD_ZIP_LIBRARY, {
+            execute: () => this.addZipLibrary(),
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        const includeLibMenuPath = [
+            ...ArduinoMenus.SKETCH__UTILS_GROUP,
+            '0_include',
+        ];
+        // TODO: do we need it? calling `registerSubmenu` multiple times is noop, so it does not hurt.
+        registry.registerSubmenu(includeLibMenuPath, 'Include Library', {
+            order: '1',
+        });
+        registry.registerMenuAction([...includeLibMenuPath, '1_install'], {
+            commandId: AddZipLibrary.Commands.ADD_ZIP_LIBRARY.id,
+            label: 'Add .ZIP Library...',
+            order: '1',
+        });
+    }
+
+    async addZipLibrary(): Promise<void> {
+        const homeUri = await this.envVariableServer.getHomeDirUri();
+        const defaultPath = await this.fileService.fsPath(new URI(homeUri));
+        const { canceled, filePaths } = await remote.dialog.showOpenDialog({
+            title: "Select a zip file containing the library you'd like to add",
+            defaultPath,
+            properties: ['openFile'],
+            filters: [
+                {
+                    name: 'Library',
+                    extensions: ['zip'],
+                },
+            ],
+        });
+        if (!canceled && filePaths.length) {
+            const zipUri = await this.fileSystemExt.getUri(filePaths[0]);
+            try {
+                await this.doInstall(zipUri);
+            } catch (error) {
+                if (error instanceof AlreadyInstalledError) {
+                    const result = await new ConfirmDialog({
+                        msg: error.message,
+                        title: 'Do you want to overwrite the existing library?',
+                        ok: 'Yes',
+                        cancel: 'No',
+                    }).open();
+                    if (result) {
+                        await this.doInstall(zipUri, true);
+                    }
+                }
+            }
+        }
+    }
+
+    private async doInstall(
+        zipUri: string,
+        overwrite?: boolean
+    ): Promise<void> {
+        try {
+            await Installable.doWithProgress({
+                messageService: this.messageService,
+                progressText: `Processing ${new URI(zipUri).path.base}`,
+                responseService: this.responseService,
+                run: () =>
+                    this.libraryService.installZip({ zipUri, overwrite }),
+            });
+            this.messageService.info(
+                `Successfully installed library from ${
+                    new URI(zipUri).path.base
+                } archive`,
+                { timeout: 3000 }
+            );
+        } catch (error) {
+            if (error instanceof Error) {
+                const match = error.message.match(
+                    /library (.*?) already installed/
+                );
+                if (match && match.length >= 2) {
+                    const name = match[1].trim();
+                    if (name) {
+                        throw new AlreadyInstalledError(
+                            `A library folder named ${name} already exists. Do you want to overwrite it?`,
+                            name
+                        );
+                    } else {
+                        throw new AlreadyInstalledError(
+                            'A library already exists. Do you want to overwrite it?'
+                        );
+                    }
+                }
+            }
+            this.messageService.error(error.toString());
+            throw error;
+        }
+    }
+}
+
+class AlreadyInstalledError extends Error {
+    constructor(message: string, readonly libraryName?: string) {
+        super(message);
+        Object.setPrototypeOf(this, AlreadyInstalledError.prototype);
+    }
+}
+
+export namespace AddZipLibrary {
+    export namespace Commands {
+        export const ADD_ZIP_LIBRARY: Command = {
+            id: 'arduino-add-zip-library',
+        };
+    }
+}

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

@@ -0,0 +1,68 @@
+import { injectable } from 'inversify';
+import { remote } from 'electron';
+import * as dateFormat from 'dateformat';
+import URI from '@theia/core/lib/common/uri';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import {
+    SketchContribution,
+    Command,
+    CommandRegistry,
+    MenuModelRegistry,
+} from './contribution';
+
+@injectable()
+export class ArchiveSketch extends SketchContribution {
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(ArchiveSketch.Commands.ARCHIVE_SKETCH, {
+            execute: () => this.archiveSketch(),
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.TOOLS__MAIN_GROUP, {
+            commandId: ArchiveSketch.Commands.ARCHIVE_SKETCH.id,
+            label: 'Archive Sketch',
+            order: '1',
+        });
+    }
+
+    protected async archiveSketch(): Promise<void> {
+        const [sketch, config] = await Promise.all([
+            this.sketchServiceClient.currentSketch(),
+            this.configService.getConfiguration(),
+        ]);
+        if (!sketch) {
+            return;
+        }
+        const archiveBasename = `${sketch.name}-${dateFormat(
+            new Date(),
+            'yymmdd'
+        )}a.zip`;
+        const defaultPath = await this.fileService.fsPath(
+            new URI(config.sketchDirUri).resolve(archiveBasename)
+        );
+        const { filePath, canceled } = await remote.dialog.showSaveDialog({
+            title: 'Save sketch folder as...',
+            defaultPath,
+        });
+        if (!filePath || canceled) {
+            return;
+        }
+        const destinationUri = await this.fileSystemExt.getUri(filePath);
+        if (!destinationUri) {
+            return;
+        }
+        await this.sketchService.archive(sketch, destinationUri.toString());
+        this.messageService.info(`Created archive '${archiveBasename}'.`, {
+            timeout: 2000,
+        });
+    }
+}
+
+export namespace ArchiveSketch {
+    export namespace Commands {
+        export const ARCHIVE_SKETCH: Command = {
+            id: 'arduino-archive-sketch',
+        };
+    }
+}

arduino-ide-extension/src/browser/contributions/board-selection.ts

@@ -0,0 +1,338 @@
+import { inject, injectable } from 'inversify';
+import { remote } from 'electron';
+import { MenuModelRegistry } from '@theia/core/lib/common/menu';
+import {
+    DisposableCollection,
+    Disposable,
+} from '@theia/core/lib/common/disposable';
+import { firstToUpperCase } from '../../common/utils';
+import { BoardsConfig } from '../boards/boards-config';
+import { MainMenuManager } from '../../common/main-menu-manager';
+import { BoardsListWidget } from '../boards/boards-list-widget';
+import { NotificationCenter } from '../notification-center';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import {
+    ArduinoMenus,
+    PlaceholderMenuNode,
+    unregisterSubmenu,
+} from '../menu/arduino-menus';
+import {
+    BoardsService,
+    InstalledBoardWithPackage,
+    AvailablePorts,
+    Port,
+} from '../../common/protocol';
+import { SketchContribution, Command, CommandRegistry } from './contribution';
+
+@injectable()
+export class BoardSelection extends SketchContribution {
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
+
+    @inject(MainMenuManager)
+    protected readonly mainMenuManager: MainMenuManager;
+
+    @inject(MenuModelRegistry)
+    protected readonly menuModelRegistry: MenuModelRegistry;
+
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
+
+    @inject(BoardsService)
+    protected readonly boardsService: BoardsService;
+
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceProvider: BoardsServiceProvider;
+
+    protected readonly toDisposeBeforeMenuRebuild = new DisposableCollection();
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(BoardSelection.Commands.GET_BOARD_INFO, {
+            execute: async () => {
+                const { selectedBoard, selectedPort } =
+                    this.boardsServiceProvider.boardsConfig;
+                if (!selectedBoard) {
+                    this.messageService.info(
+                        'Please select a board to obtain board info.'
+                    );
+                    return;
+                }
+                if (!selectedBoard.fqbn) {
+                    this.messageService.info(
+                        `The platform for the selected '${selectedBoard.name}' board is not installed.`
+                    );
+                    return;
+                }
+                if (!selectedPort) {
+                    this.messageService.info(
+                        'Please select a port to obtain board info.'
+                    );
+                    return;
+                }
+                const boardDetails = await this.boardsService.getBoardDetails({
+                    fqbn: selectedBoard.fqbn,
+                });
+                if (boardDetails) {
+                    const { VID, PID } = boardDetails;
+                    const detail = `BN: ${selectedBoard.name}
+VID: ${VID}
+PID: ${PID}`;
+                    await remote.dialog.showMessageBox(
+                        remote.getCurrentWindow(),
+                        {
+                            message: 'Board Info',
+                            title: 'Board Info',
+                            type: 'info',
+                            detail,
+                            buttons: ['OK'],
+                        }
+                    );
+                }
+            },
+        });
+    }
+
+    onStart(): void {
+        this.updateMenus();
+        this.notificationCenter.onPlatformInstalled(
+            this.updateMenus.bind(this)
+        );
+        this.notificationCenter.onPlatformUninstalled(
+            this.updateMenus.bind(this)
+        );
+        this.boardsServiceProvider.onBoardsConfigChanged(
+            this.updateMenus.bind(this)
+        );
+        this.boardsServiceProvider.onAvailableBoardsChanged(
+            this.updateMenus.bind(this)
+        );
+    }
+
+    protected async updateMenus(): Promise<void> {
+        const [installedBoards, availablePorts, config] = await Promise.all([
+            this.installedBoards(),
+            this.boardsService.getState(),
+            this.boardsServiceProvider.boardsConfig,
+        ]);
+        this.rebuildMenus(installedBoards, availablePorts, config);
+    }
+
+    protected rebuildMenus(
+        installedBoards: InstalledBoardWithPackage[],
+        availablePorts: AvailablePorts,
+        config: BoardsConfig.Config
+    ): void {
+        this.toDisposeBeforeMenuRebuild.dispose();
+
+        // Boards submenu
+        const boardsSubmenuPath = [
+            ...ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP,
+            '1_boards',
+        ];
+        const boardsSubmenuLabel = config.selectedBoard?.name;
+        // Note: The submenu order starts from `100` because `Auto Format`, `Serial Monitor`, etc starts from `0` index.
+        // The board specific items, and the rest, have order with `z`. We needed something between `0` and `z` with natural-order.
+        this.menuModelRegistry.registerSubmenu(
+            boardsSubmenuPath,
+            `Board${!!boardsSubmenuLabel ? `: "${boardsSubmenuLabel}"` : ''}`,
+            { order: '100' }
+        );
+        this.toDisposeBeforeMenuRebuild.push(
+            Disposable.create(() =>
+                unregisterSubmenu(boardsSubmenuPath, this.menuModelRegistry)
+            )
+        );
+
+        // Ports submenu
+        const portsSubmenuPath = [
+            ...ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP,
+            '2_ports',
+        ];
+        const portsSubmenuLabel = config.selectedPort?.address;
+        this.menuModelRegistry.registerSubmenu(
+            portsSubmenuPath,
+            `Port${!!portsSubmenuLabel ? `: "${portsSubmenuLabel}"` : ''}`,
+            { order: '101' }
+        );
+        this.toDisposeBeforeMenuRebuild.push(
+            Disposable.create(() =>
+                unregisterSubmenu(portsSubmenuPath, this.menuModelRegistry)
+            )
+        );
+
+        const getBoardInfo = {
+            commandId: BoardSelection.Commands.GET_BOARD_INFO.id,
+            label: 'Get Board Info',
+            order: '103',
+        };
+        this.menuModelRegistry.registerMenuAction(
+            ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP,
+            getBoardInfo
+        );
+        this.toDisposeBeforeMenuRebuild.push(
+            Disposable.create(() =>
+                this.menuModelRegistry.unregisterMenuAction(getBoardInfo)
+            )
+        );
+
+        const boardsManagerGroup = [...boardsSubmenuPath, '0_manager'];
+        const boardsPackagesGroup = [...boardsSubmenuPath, '1_packages'];
+
+        this.menuModelRegistry.registerMenuAction(boardsManagerGroup, {
+            commandId: `${BoardsListWidget.WIDGET_ID}:toggle`,
+            label: 'Boards Manager...',
+        });
+
+        // Installed boards
+        for (const board of installedBoards) {
+            const { packageId, packageName, fqbn, name } = board;
+
+            // Platform submenu
+            const platformMenuPath = [...boardsPackagesGroup, packageId];
+            // Note: Registering the same submenu twice is a noop. No need to group the boards per platform.
+            this.menuModelRegistry.registerSubmenu(
+                platformMenuPath,
+                packageName
+            );
+
+            const id = `arduino-select-board--${fqbn}`;
+            const command = { id };
+            const handler = {
+                execute: () => {
+                    if (
+                        fqbn !==
+                        this.boardsServiceProvider.boardsConfig.selectedBoard
+                            ?.fqbn
+                    ) {
+                        this.boardsServiceProvider.boardsConfig = {
+                            selectedBoard: {
+                                name,
+                                fqbn,
+                                port: this.boardsServiceProvider.boardsConfig
+                                    .selectedBoard?.port, // TODO: verify!
+                            },
+                            selectedPort:
+                                this.boardsServiceProvider.boardsConfig
+                                    .selectedPort,
+                        };
+                    }
+                },
+                isToggled: () =>
+                    fqbn ===
+                    this.boardsServiceProvider.boardsConfig.selectedBoard?.fqbn,
+            };
+
+            // Board menu
+            const menuAction = { commandId: id, label: name };
+            this.commandRegistry.registerCommand(command, handler);
+            this.toDisposeBeforeMenuRebuild.push(
+                Disposable.create(() =>
+                    this.commandRegistry.unregisterCommand(command)
+                )
+            );
+            this.menuModelRegistry.registerMenuAction(
+                platformMenuPath,
+                menuAction
+            );
+            // Note: we do not dispose the menu actions individually. Calling `unregisterSubmenu` on the parent will wipe the children menu nodes recursively.
+        }
+
+        // Installed ports
+        const registerPorts = (ports: AvailablePorts) => {
+            const addresses = Object.keys(ports);
+            if (!addresses.length) {
+                return;
+            }
+
+            // Register placeholder for protocol
+            const [port] = ports[addresses[0]];
+            const protocol = port.protocol;
+            const menuPath = [...portsSubmenuPath, protocol];
+            const placeholder = new PlaceholderMenuNode(
+                menuPath,
+                `${firstToUpperCase(port.protocol)} ports`
+            );
+            this.menuModelRegistry.registerMenuNode(menuPath, placeholder);
+            this.toDisposeBeforeMenuRebuild.push(
+                Disposable.create(() =>
+                    this.menuModelRegistry.unregisterMenuNode(placeholder.id)
+                )
+            );
+
+            for (const address of addresses) {
+                if (!!ports[address]) {
+                    const [port, boards] = ports[address];
+                    if (!boards.length) {
+                        boards.push({
+                            name: '',
+                        });
+                    }
+                    for (const { name, fqbn } of boards) {
+                        const id = `arduino-select-port--${address}${
+                            fqbn ? `--${fqbn}` : ''
+                        }`;
+                        const command = { id };
+                        const handler = {
+                            execute: () => {
+                                if (
+                                    !Port.equals(
+                                        port,
+                                        this.boardsServiceProvider.boardsConfig
+                                            .selectedPort
+                                    )
+                                ) {
+                                    this.boardsServiceProvider.boardsConfig = {
+                                        selectedBoard:
+                                            this.boardsServiceProvider
+                                                .boardsConfig.selectedBoard,
+                                        selectedPort: port,
+                                    };
+                                }
+                            },
+                            isToggled: () =>
+                                Port.equals(
+                                    port,
+                                    this.boardsServiceProvider.boardsConfig
+                                        .selectedPort
+                                ),
+                        };
+                        const label = `${address}${name ? ` (${name})` : ''}`;
+                        const menuAction = {
+                            commandId: id,
+                            label,
+                            order: `1${label}`, // `1` comes after the placeholder which has order `0`
+                        };
+                        this.commandRegistry.registerCommand(command, handler);
+                        this.toDisposeBeforeMenuRebuild.push(
+                            Disposable.create(() =>
+                                this.commandRegistry.unregisterCommand(command)
+                            )
+                        );
+                        this.menuModelRegistry.registerMenuAction(
+                            menuPath,
+                            menuAction
+                        );
+                    }
+                }
+            }
+        };
+
+        const { serial, network, unknown } =
+            AvailablePorts.groupByProtocol(availablePorts);
+        registerPorts(serial);
+        registerPorts(network);
+        registerPorts(unknown);
+
+        this.mainMenuManager.update();
+    }
+
+    protected async installedBoards(): Promise<InstalledBoardWithPackage[]> {
+        const allBoards = await this.boardsService.searchBoards({});
+        return allBoards.filter(InstalledBoardWithPackage.is);
+    }
+}
+export namespace BoardSelection {
+    export namespace Commands {
+        export const GET_BOARD_INFO: Command = { id: 'arduino-get-board-info' };
+    }
+}

arduino-ide-extension/src/browser/contributions/burn-bootloader.ts

@@ -5,11 +5,15 @@ import { ArduinoMenus } from '../menu/arduino-menus';
 import { BoardsDataStore } from '../boards/boards-data-store';
 import { MonitorConnection } from '../monitor/monitor-connection';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import { SketchContribution, Command, CommandRegistry, MenuModelRegistry } from './contribution';
+import {
+    SketchContribution,
+    Command,
+    CommandRegistry,
+    MenuModelRegistry,
+} from './contribution';
 
 @injectable()
 export class BurnBootloader extends SketchContribution {
-
     @inject(CoreService)
     protected readonly coreService: CoreService;
 
@@ -27,7 +31,7 @@ export class BurnBootloader extends SketchContribution {
 
     registerCommands(registry: CommandRegistry): void {
         registry.registerCommand(BurnBootloader.Commands.BURN_BOOTLOADER, {
-            execute: () => this.burnBootloader()
+            execute: () => this.burnBootloader(),
         });
     }
 
@@ -35,7 +39,7 @@ export class BurnBootloader extends SketchContribution {
         registry.registerMenuAction(ArduinoMenus.TOOLS__BOARD_SETTINGS_GROUP, {
             commandId: BurnBootloader.Commands.BURN_BOOTLOADER.id,
             label: 'Burn Bootloader',
-            order: 'z99'
+            order: 'z99',
         });
     }
 
@@ -47,17 +51,28 @@ export class BurnBootloader extends SketchContribution {
         try {
             const { boardsConfig } = this.boardsServiceClientImpl;
             const port = boardsConfig.selectedPort?.address;
-            const [fqbn, { selectedProgrammer: programmer }] = await Promise.all([
-                this.boardsDataStore.appendConfigToFqbn(boardsConfig.selectedBoard?.fqbn),
-                this.boardsDataStore.getData(boardsConfig.selectedBoard?.fqbn)
-            ]);
-            this.outputChannelManager.getChannel('Arduino: bootloader').clear();
+            const [fqbn, { selectedProgrammer: programmer }, verify, verbose] =
+                await Promise.all([
+                    this.boardsDataStore.appendConfigToFqbn(
+                        boardsConfig.selectedBoard?.fqbn
+                    ),
+                    this.boardsDataStore.getData(
+                        boardsConfig.selectedBoard?.fqbn
+                    ),
+                    this.preferences.get('arduino.upload.verify'),
+                    this.preferences.get('arduino.upload.verbose'),
+                ]);
+            this.outputChannelManager.getChannel('Arduino').clear();
             await this.coreService.burnBootloader({
                 fqbn,
                 programmer,
-                port
+                port,
+                verify,
+                verbose,
+            });
+            this.messageService.info('Done burning bootloader.', {
+                timeout: 3000,
             });
-            this.messageService.info('Done burning bootloader.', { timeout: 1000 });
         } catch (e) {
             this.messageService.error(e.toString());
         } finally {
@@ -66,13 +81,12 @@ export class BurnBootloader extends SketchContribution {
             }
         }
     }
-
 }
 
 export namespace BurnBootloader {
     export namespace Commands {
         export const BURN_BOOTLOADER: Command = {
-            id: 'arduino-burn-bootloader'
+            id: 'arduino-burn-bootloader',
         };
     }
 }

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

@@ -1,89 +0,0 @@
-import { inject, injectable } from 'inversify';
-import { remote } from 'electron';
-import { ArduinoMenus } from '../menu/arduino-menus';
-import { SketchContribution, Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, URI } from './contribution';
-import { SaveAsSketch } from './save-as-sketch';
-import { EditorManager } from '@theia/editor/lib/browser';
-import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
-
-@injectable()
-export class CloseSketch extends SketchContribution {
-
-    @inject(EditorManager)
-    protected readonly editorManager: EditorManager;
-
-    registerCommands(registry: CommandRegistry): void {
-        registry.registerCommand(CloseSketch.Commands.CLOSE_SKETCH, {
-            execute: async () => {
-                const sketch = await this.sketchServiceClient.currentSketch();
-                if (!sketch) {
-                    return;
-                }
-                const isTemp = await this.sketchService.isTemp(sketch);
-                const uri = await this.sketchServiceClient.currentSketchFile();
-                if (!uri) {
-                    return;
-                }
-                if (isTemp && await this.wasTouched(uri)) {
-                    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;
-                        }
-                    }
-                }
-                window.close();
-            }
-        });
-    }
-
-    registerMenus(registry: MenuModelRegistry): void {
-        registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
-            commandId: CloseSketch.Commands.CLOSE_SKETCH.id,
-            label: 'Close',
-            order: '5'
-        });
-    }
-
-    registerKeybindings(registry: KeybindingRegistry): void {
-        registry.registerKeybinding({
-            command: CloseSketch.Commands.CLOSE_SKETCH.id,
-            keybinding: 'CtrlCmd+W'
-        });
-    }
-
-    /**
-     * If the file was ever touched/modified. We get this based on the `version` of the monaco model.
-     */
-    protected async wasTouched(uri: string): Promise<boolean> {
-        const editorWidget = await this.editorManager.getByUri(new URI(uri));
-        if (editorWidget) {
-            const { editor } = editorWidget;
-            if (editor instanceof MonacoEditor) {
-                const versionId = editor.getControl().getModel()?.getVersionId();
-                if (Number.isInteger(versionId) && versionId! > 1) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-}
-
-export namespace CloseSketch {
-    export namespace Commands {
-        export const CLOSE_SKETCH: Command = {
-            id: 'arduino-close-sketch'
-        };
-    }
-}

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

@@ -0,0 +1,138 @@
+import { inject, injectable } from 'inversify';
+import { toArray } from '@phosphor/algorithm';
+import { remote } from 'electron';
+import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
+import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
+import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
+import { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import { SaveAsSketch } from './save-as-sketch';
+import {
+    SketchContribution,
+    Command,
+    CommandRegistry,
+    MenuModelRegistry,
+    KeybindingRegistry,
+    URI,
+} from './contribution';
+
+/**
+ * Closes the `current` closeable editor, or any closeable current widget from the main area, or the current sketch window.
+ */
+@injectable()
+export class Close extends SketchContribution {
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
+
+    protected shell: ApplicationShell;
+
+    onStart(app: FrontendApplication): void {
+        this.shell = app.shell;
+    }
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(Close.Commands.CLOSE, {
+            execute: async () => {
+                // Close current editor if closeable.
+                const { currentEditor } = this.editorManager;
+                if (currentEditor && currentEditor.title.closable) {
+                    currentEditor.close();
+                    return;
+                }
+
+                // Close current widget from the main area if possible.
+                const { currentWidget } = this.shell;
+                if (currentWidget) {
+                    const currentWidgetInMain = toArray(
+                        this.shell.mainPanel.widgets()
+                    ).find((widget) => widget === currentWidget);
+                    if (
+                        currentWidgetInMain &&
+                        currentWidgetInMain.title.closable
+                    ) {
+                        return currentWidgetInMain.close();
+                    }
+                }
+
+                // Close the sketch (window).
+                const sketch = await this.sketchServiceClient.currentSketch();
+                if (!sketch) {
+                    return;
+                }
+                const isTemp = await this.sketchService.isTemp(sketch);
+                const uri = await this.sketchServiceClient.currentSketchFile();
+                if (!uri) {
+                    return;
+                }
+                if (isTemp && (await this.wasTouched(uri))) {
+                    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;
+                        }
+                    }
+                }
+                window.close();
+            },
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
+            commandId: Close.Commands.CLOSE.id,
+            label: 'Close',
+            order: '5',
+        });
+    }
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybinding({
+            command: Close.Commands.CLOSE.id,
+            keybinding: 'CtrlCmd+W',
+        });
+    }
+
+    /**
+     * If the file was ever touched/modified. We get this based on the `version` of the monaco model.
+     */
+    protected async wasTouched(uri: string): Promise<boolean> {
+        const editorWidget = await this.editorManager.getByUri(new URI(uri));
+        if (editorWidget) {
+            const { editor } = editorWidget;
+            if (editor instanceof MonacoEditor) {
+                const versionId = editor
+                    .getControl()
+                    .getModel()
+                    ?.getVersionId();
+                if (Number.isInteger(versionId) && versionId! > 1) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+}
+
+export namespace Close {
+    export namespace Commands {
+        export const CLOSE: Command = {
+            id: 'arduino-close',
+        };
+    }
+}

arduino-ide-extension/src/browser/contributions/contribution.ts

@@ -1,26 +1,68 @@
 import { inject, injectable, interfaces } from 'inversify';
 import URI from '@theia/core/lib/common/uri';
 import { ILogger } from '@theia/core/lib/common/logger';
+import { Saveable } from '@theia/core/lib/browser/saveable';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { LabelProvider } from '@theia/core/lib/browser/label-provider';
+import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import { open, OpenerService } from '@theia/core/lib/browser/opener-service';
-import { MenuModelRegistry, MenuContribution } from '@theia/core/lib/common/menu';
-import { KeybindingRegistry, KeybindingContribution } from '@theia/core/lib/browser/keybinding';
-import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import { Command, CommandRegistry, CommandContribution, CommandService } from '@theia/core/lib/common/command';
+import { OutputChannelManager } from '@theia/output/lib/common/output-channel';
+import {
+    MenuModelRegistry,
+    MenuContribution,
+} from '@theia/core/lib/common/menu';
+import {
+    KeybindingRegistry,
+    KeybindingContribution,
+} from '@theia/core/lib/browser/keybinding';
+import {
+    TabBarToolbarContribution,
+    TabBarToolbarRegistry,
+} from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import {
+    FrontendApplicationContribution,
+    FrontendApplication,
+} from '@theia/core/lib/browser/frontend-application';
+import {
+    Command,
+    CommandRegistry,
+    CommandContribution,
+    CommandService,
+} from '@theia/core/lib/common/command';
 import { EditorMode } from '../editor-mode';
+import { SettingsService } from '../settings';
 import { SketchesServiceClientImpl } from '../../common/protocol/sketches-service-client-impl';
-import { SketchesService, ConfigService, FileSystemExt, Sketch } from '../../common/protocol';
-import { FrontendApplicationContribution, FrontendApplication } from '@theia/core/lib/browser';
+import {
+    SketchesService,
+    ConfigService,
+    FileSystemExt,
+    Sketch,
+} from '../../common/protocol';
+import { ArduinoPreferences } from '../arduino-preferences';
 
-export { Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, TabBarToolbarRegistry, URI, Sketch, open };
+export {
+    Command,
+    CommandRegistry,
+    MenuModelRegistry,
+    KeybindingRegistry,
+    TabBarToolbarRegistry,
+    URI,
+    Sketch,
+    open,
+};
 
 @injectable()
-export abstract class Contribution implements CommandContribution, MenuContribution, KeybindingContribution, TabBarToolbarContribution, FrontendApplicationContribution {
-
+export abstract class Contribution
+    implements
+        CommandContribution,
+        MenuContribution,
+        KeybindingContribution,
+        TabBarToolbarContribution,
+        FrontendApplicationContribution
+{
     @inject(ILogger)
     protected readonly logger: ILogger;
 
@@ -39,26 +81,22 @@ export abstract class Contribution implements CommandContribution, MenuContribut
     @inject(LabelProvider)
     protected readonly labelProvider: LabelProvider;
 
-    onStart(app: FrontendApplication): MaybePromise<void> {
-    }
+    @inject(SettingsService)
+    protected readonly settingsService: SettingsService;
 
-    registerCommands(registry: CommandRegistry): void {
-    }
+    onStart(app: FrontendApplication): MaybePromise<void> {}
 
-    registerMenus(registry: MenuModelRegistry): void {
-    }
+    registerCommands(registry: CommandRegistry): void {}
 
-    registerKeybindings(registry: KeybindingRegistry): void {
-    }
+    registerMenus(registry: MenuModelRegistry): void {}
 
-    registerToolbarItems(registry: TabBarToolbarRegistry): void {
-    }
+    registerKeybindings(registry: KeybindingRegistry): void {}
 
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {}
 }
 
 @injectable()
 export abstract class SketchContribution extends Contribution {
-
     @inject(FileService)
     protected readonly fileService: FileService;
 
@@ -77,10 +115,38 @@ export abstract class SketchContribution extends Contribution {
     @inject(SketchesServiceClientImpl)
     protected readonly sketchServiceClient: SketchesServiceClientImpl;
 
+    @inject(ArduinoPreferences)
+    protected readonly preferences: ArduinoPreferences;
+
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
+
+    @inject(OutputChannelManager)
+    protected readonly outputChannelManager: OutputChannelManager;
+
+    protected async sourceOverride(): Promise<Record<string, string>> {
+        const override: Record<string, string> = {};
+        const sketch = await this.sketchServiceClient.currentSketch();
+        if (sketch) {
+            for (const editor of this.editorManager.all) {
+                const uri = editor.editor.uri;
+                if (
+                    Saveable.isDirty(editor) &&
+                    Sketch.isInSketch(uri, sketch)
+                ) {
+                    override[uri.toString()] = editor.editor.document.getText();
+                }
+            }
+        }
+        return override;
+    }
 }
 
 export namespace Contribution {
-    export function configure<T>(bind: interfaces.Bind, serviceIdentifier: typeof Contribution): void {
+    export function configure<T>(
+        bind: interfaces.Bind,
+        serviceIdentifier: typeof Contribution
+    ): void {
         bind(serviceIdentifier).toSelf().inSingletonScope();
         bind(CommandContribution).toService(serviceIdentifier);
         bind(MenuContribution).toService(serviceIdentifier);

arduino-ide-extension/src/browser/contributions/debug.ts

@@ -5,11 +5,16 @@ import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import { NotificationCenter } from '../notification-center';
 import { Board, BoardsService, ExecutableService } from '../../common/protocol';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import { URI, Command, CommandRegistry, SketchContribution, TabBarToolbarRegistry } from './contribution';
+import {
+    URI,
+    Command,
+    CommandRegistry,
+    SketchContribution,
+    TabBarToolbarRegistry,
+} from './contribution';
 
 @injectable()
 export class Debug extends SketchContribution {
-
     @inject(HostedPluginSupport)
     protected hostedPluginSupport: HostedPluginSupport;
 
@@ -29,8 +34,11 @@ export class Debug extends SketchContribution {
      * If `undefined`, debugging is enabled. Otherwise, the reason why it's disabled.
      */
     protected _disabledMessages?: string = 'No board selected'; // Initial pessimism.
-    protected disabledMessageDidChangeEmitter = new Emitter<string | undefined>();
-    protected onDisabledMessageDidChange = this.disabledMessageDidChangeEmitter.event;
+    protected disabledMessageDidChangeEmitter = new Emitter<
+        string | undefined
+    >();
+    protected onDisabledMessageDidChange =
+        this.disabledMessageDidChangeEmitter.event;
 
     protected get disabledMessage(): string | undefined {
         return this._disabledMessages;
@@ -43,14 +51,28 @@ export class Debug extends SketchContribution {
     protected readonly debugToolbarItem = {
         id: Debug.Commands.START_DEBUGGING.id,
         command: Debug.Commands.START_DEBUGGING.id,
-        tooltip: `${this.disabledMessage ? `Debug - ${this.disabledMessage}` : 'Start Debugging'}`,
+        tooltip: `${
+            this.disabledMessage
+                ? `Debug - ${this.disabledMessage}`
+                : 'Start Debugging'
+        }`,
         priority: 3,
-        onDidChange: this.onDisabledMessageDidChange as Event<void>
+        onDidChange: this.onDisabledMessageDidChange as Event<void>,
     };
 
     onStart(): void {
-        this.onDisabledMessageDidChange(() => this.debugToolbarItem.tooltip = `${this.disabledMessage ? `Debug - ${this.disabledMessage}` : 'Start Debugging'}`);
-        const refreshState = async (board: Board | undefined = this.boardsServiceProvider.boardsConfig.selectedBoard) => {
+        this.onDisabledMessageDidChange(
+            () =>
+                (this.debugToolbarItem.tooltip = `${
+                    this.disabledMessage
+                        ? `Debug - ${this.disabledMessage}`
+                        : 'Start Debugging'
+                }`)
+        );
+        const refreshState = async (
+            board: Board | undefined = this.boardsServiceProvider.boardsConfig
+                .selectedBoard
+        ) => {
             if (!board) {
                 this.disabledMessage = 'No board selected';
                 return;
@@ -71,8 +93,10 @@ export class Debug extends SketchContribution {
             } else {
                 this.disabledMessage = undefined;
             }
-        }
-        this.boardsServiceProvider.onBoardsConfigChanged(({ selectedBoard }) => refreshState(selectedBoard));
+        };
+        this.boardsServiceProvider.onBoardsConfigChanged(({ selectedBoard }) =>
+            refreshState(selectedBoard)
+        );
         this.notificationCenter.onPlatformInstalled(() => refreshState());
         this.notificationCenter.onPlatformUninstalled(() => refreshState());
         refreshState();
@@ -81,8 +105,9 @@ export class Debug extends SketchContribution {
     registerCommands(registry: CommandRegistry): void {
         registry.registerCommand(Debug.Commands.START_DEBUGGING, {
             execute: () => this.startDebug(),
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
-            isEnabled: () => !this.disabledMessage
+            isVisible: (widget) =>
+                ArduinoToolbar.is(widget) && widget.side === 'left',
+            isEnabled: () => !this.disabledMessage,
         });
     }
 
@@ -90,7 +115,10 @@ export class Debug extends SketchContribution {
         registry.registerItem(this.debugToolbarItem);
     }
 
-    protected async startDebug(board: Board | undefined = this.boardsServiceProvider.boardsConfig.selectedBoard): Promise<void> {
+    protected async startDebug(
+        board: Board | undefined = this.boardsServiceProvider.boardsConfig
+            .selectedBoard
+    ): Promise<void> {
         if (!board) {
             return;
         }
@@ -101,26 +129,33 @@ export class Debug extends SketchContribution {
         await this.hostedPluginSupport.didStart;
         const [sketch, executables] = await Promise.all([
             this.sketchServiceClient.currentSketch(),
-            this.executableService.list()
+            this.executableService.list(),
         ]);
         if (!sketch) {
             return;
         }
-        const [cliPath, sketchPath] = await Promise.all([
+        const ideTempFolderUri = await this.sketchService.getIdeTempFolderUri(
+            sketch
+        );
+        const [cliPath, sketchPath, configPath] = await Promise.all([
             this.fileService.fsPath(new URI(executables.cliUri)),
-            this.fileService.fsPath(new URI(sketch.uri))
-        ])
+            this.fileService.fsPath(new URI(sketch.uri)),
+            this.fileService.fsPath(new URI(ideTempFolderUri)),
+        ]);
         const config = {
             cliPath,
             board: {
                 fqbn,
-                name
+                name,
             },
-            sketchPath
+            sketchPath,
+            configPath,
         };
-        return this.commandService.executeCommand('arduino.debug.start', config);
+        return this.commandService.executeCommand(
+            'arduino.debug.start',
+            config
+        );
     }
-
 }
 
 export namespace Debug {
@@ -128,7 +163,7 @@ export namespace Debug {
         export const START_DEBUGGING: Command = {
             id: 'arduino-start-debug',
             label: 'Start Debugging',
-            category: 'Arduino'
-        }
+            category: 'Arduino',
+        };
     }
 }

arduino-ide-extension/src/browser/contributions/edit-contributions.ts

@@ -3,15 +3,19 @@ import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribu
 import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
 import { PreferenceService } from '@theia/core/lib/browser/preferences/preference-service';
 import { MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-service';
-import { EDITOR_FONT_DEFAULTS } from '@theia/editor/lib/browser/editor-preferences';
-import { Contribution, Command, MenuModelRegistry, KeybindingRegistry, CommandRegistry } from './contribution';
+import {
+    Contribution,
+    Command,
+    MenuModelRegistry,
+    KeybindingRegistry,
+    CommandRegistry,
+} from './contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
 
 // TODO: [macOS]: to remove `Start Dictation...` and `Emoji & Symbol` see this thread: https://github.com/electron/electron/issues/8283#issuecomment-269522072
 // Depends on https://github.com/eclipse-theia/theia/pull/7964
 @injectable()
 export class EditContributions extends Contribution {
-
     @inject(MonacoEditorService)
     protected readonly codeEditorService: MonacoEditorService;
 
@@ -22,30 +26,74 @@ export class EditContributions extends Contribution {
     protected readonly preferences: PreferenceService;
 
     registerCommands(registry: CommandRegistry): void {
-        registry.registerCommand(EditContributions.Commands.GO_TO_LINE, { execute: () => this.run('editor.action.gotoLine') });
-        registry.registerCommand(EditContributions.Commands.TOGGLE_COMMENT, { execute: () => this.run('editor.action.commentLine') });
-        registry.registerCommand(EditContributions.Commands.INDENT_LINES, { execute: () => this.run('editor.action.indentLines') });
-        registry.registerCommand(EditContributions.Commands.OUTDENT_LINES, { execute: () => this.run('editor.action.outdentLines') });
-        registry.registerCommand(EditContributions.Commands.FIND, { execute: () => this.run('actions.find') });
-        registry.registerCommand(EditContributions.Commands.FIND_NEXT, { execute: () => this.run('actions.findWithSelection') });
-        registry.registerCommand(EditContributions.Commands.FIND_PREVIOUS, { execute: () => this.run('editor.action.nextMatchFindAction') });
-        registry.registerCommand(EditContributions.Commands.USE_FOR_FIND, { execute: () => this.run('editor.action.previousSelectionMatchFindAction') });
-        registry.registerCommand(EditContributions.Commands.INCREASE_FONT_SIZE, {
-            execute: () => this.preferences.set('editor.fontSize', this.preferences.get('editor.fontSize', EDITOR_FONT_DEFAULTS.fontSize) + 1)
+        registry.registerCommand(EditContributions.Commands.GO_TO_LINE, {
+            execute: () => this.run('editor.action.gotoLine'),
         });
-        registry.registerCommand(EditContributions.Commands.DECREASE_FONT_SIZE, {
-            execute: () => this.preferences.set('editor.fontSize', this.preferences.get('editor.fontSize', EDITOR_FONT_DEFAULTS.fontSize) - 1)
+        registry.registerCommand(EditContributions.Commands.TOGGLE_COMMENT, {
+            execute: () => this.run('editor.action.commentLine'),
         });
-        /* Tools */registry.registerCommand(EditContributions.Commands.AUTO_FORMAT, { execute: () => this.run('editor.action.formatDocument') });
+        registry.registerCommand(EditContributions.Commands.INDENT_LINES, {
+            execute: () => this.run('editor.action.indentLines'),
+        });
+        registry.registerCommand(EditContributions.Commands.OUTDENT_LINES, {
+            execute: () => this.run('editor.action.outdentLines'),
+        });
+        registry.registerCommand(EditContributions.Commands.FIND, {
+            execute: () => this.run('actions.find'),
+        });
+        registry.registerCommand(EditContributions.Commands.FIND_NEXT, {
+            execute: () => this.run('actions.findWithSelection'),
+        });
+        registry.registerCommand(EditContributions.Commands.FIND_PREVIOUS, {
+            execute: () => this.run('editor.action.nextMatchFindAction'),
+        });
+        registry.registerCommand(EditContributions.Commands.USE_FOR_FIND, {
+            execute: () =>
+                this.run('editor.action.previousSelectionMatchFindAction'),
+        });
+        registry.registerCommand(
+            EditContributions.Commands.INCREASE_FONT_SIZE,
+            {
+                execute: async () => {
+                    const settings = await this.settingsService.settings();
+                    if (settings.autoScaleInterface) {
+                        settings.interfaceScale = settings.interfaceScale + 1;
+                    } else {
+                        settings.editorFontSize = settings.editorFontSize + 1;
+                    }
+                    await this.settingsService.update(settings);
+                    await this.settingsService.save();
+                },
+            }
+        );
+        registry.registerCommand(
+            EditContributions.Commands.DECREASE_FONT_SIZE,
+            {
+                execute: async () => {
+                    const settings = await this.settingsService.settings();
+                    if (settings.autoScaleInterface) {
+                        settings.interfaceScale = settings.interfaceScale - 1;
+                    } else {
+                        settings.editorFontSize = settings.editorFontSize - 1;
+                    }
+                    await this.settingsService.update(settings);
+                    await this.settingsService.save();
+                },
+            }
+        );
+        /* Tools */ registry.registerCommand(
+            EditContributions.Commands.AUTO_FORMAT,
+            { execute: () => this.run('editor.action.formatDocument') }
+        );
         registry.registerCommand(EditContributions.Commands.COPY_FOR_FORUM, {
             execute: async () => {
                 const value = await this.currentValue();
                 if (value !== undefined) {
                     this.clipboardService.writeText(`[code]
 ${value}
-[/code]`)
+[/code]`);
                 }
-            }
+            },
         });
         registry.registerCommand(EditContributions.Commands.COPY_FOR_GITHUB, {
             execute: async () => {
@@ -53,98 +101,98 @@ ${value}
                 if (value !== undefined) {
                     this.clipboardService.writeText(`\`\`\`cpp
 ${value}
-\`\`\``)
+\`\`\``);
                 }
-            }
+            },
         });
     }
 
     registerMenus(registry: MenuModelRegistry): void {
         registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
             commandId: CommonCommands.CUT.id,
-            order: '0'
+            order: '0',
         });
         registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
             commandId: CommonCommands.COPY.id,
-            order: '1'
+            order: '1',
         });
         registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
             commandId: EditContributions.Commands.COPY_FOR_FORUM.id,
             label: 'Copy for Forum',
-            order: '2'
+            order: '2',
         });
         registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
             commandId: EditContributions.Commands.COPY_FOR_GITHUB.id,
             label: 'Copy for GitHub',
-            order: '3'
+            order: '3',
         });
         registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
             commandId: CommonCommands.PASTE.id,
-            order: '4'
+            order: '4',
         });
         registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
             commandId: CommonCommands.SELECT_ALL.id,
-            order: '5'
+            order: '5',
         });
         registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
             commandId: EditContributions.Commands.GO_TO_LINE.id,
             label: 'Go to Line...',
-            order: '6'
+            order: '6',
         });
 
         registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
             commandId: EditContributions.Commands.TOGGLE_COMMENT.id,
             label: 'Comment/Uncomment',
-            order: '0'
+            order: '0',
         });
         registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
             commandId: EditContributions.Commands.INDENT_LINES.id,
             label: 'Increase Indent',
-            order: '1'
+            order: '1',
         });
         registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
             commandId: EditContributions.Commands.OUTDENT_LINES.id,
             label: 'Decrease Indent',
-            order: '2'
+            order: '2',
         });
 
         registry.registerMenuAction(ArduinoMenus.EDIT__FONT_CONTROL_GROUP, {
             commandId: EditContributions.Commands.INCREASE_FONT_SIZE.id,
             label: 'Increase Font Size',
-            order: '0'
+            order: '0',
         });
         registry.registerMenuAction(ArduinoMenus.EDIT__FONT_CONTROL_GROUP, {
             commandId: EditContributions.Commands.DECREASE_FONT_SIZE.id,
             label: 'Decrease Font Size',
-            order: '1'
+            order: '1',
         });
 
         registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
             commandId: EditContributions.Commands.FIND.id,
             label: 'Find',
-            order: '0'
+            order: '0',
         });
         registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
             commandId: EditContributions.Commands.FIND_NEXT.id,
             label: 'Find Next',
-            order: '1'
+            order: '1',
         });
         registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
             commandId: EditContributions.Commands.FIND_PREVIOUS.id,
             label: 'Find Previous',
-            order: '2'
+            order: '2',
         });
         registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
             commandId: EditContributions.Commands.USE_FOR_FIND.id,
             label: 'Use Selection for Find', // XXX: The Java IDE uses `Use Selection For Find`.
-            order: '3'
+            order: '3',
         });
 
         // `Tools`
         registry.registerMenuAction(ArduinoMenus.TOOLS__MAIN_GROUP, {
             commandId: EditContributions.Commands.AUTO_FORMAT.id,
             label: 'Auto Format', // XXX: The Java IDE uses `Use Selection For Find`.
-            order: '0'
+            order: '0',
         });
     }
 
@@ -152,60 +200,63 @@ ${value}
         registry.registerKeybinding({
             command: EditContributions.Commands.COPY_FOR_FORUM.id,
             keybinding: 'CtrlCmd+Shift+C',
-            when: 'editorFocus'
+            when: 'editorFocus',
         });
         registry.registerKeybinding({
             command: EditContributions.Commands.COPY_FOR_GITHUB.id,
             keybinding: 'CtrlCmd+Alt+C',
-            when: 'editorFocus'
+            when: 'editorFocus',
         });
         registry.registerKeybinding({
             command: EditContributions.Commands.GO_TO_LINE.id,
             keybinding: 'CtrlCmd+L',
-            when: 'editorFocus'
+            when: 'editorFocus',
         });
 
         registry.registerKeybinding({
             command: EditContributions.Commands.TOGGLE_COMMENT.id,
             keybinding: 'CtrlCmd+/',
-            when: 'editorFocus'
+            when: 'editorFocus',
         });
 
         registry.registerKeybinding({
             command: EditContributions.Commands.INCREASE_FONT_SIZE.id,
-            keybinding: 'CtrlCmd+='
+            keybinding: 'CtrlCmd+=',
         });
         registry.registerKeybinding({
             command: EditContributions.Commands.DECREASE_FONT_SIZE.id,
-            keybinding: 'CtrlCmd+-'
+            keybinding: 'CtrlCmd+-',
         });
 
         registry.registerKeybinding({
             command: EditContributions.Commands.FIND.id,
-            keybinding: 'CtrlCmd+F'
+            keybinding: 'CtrlCmd+F',
         });
         registry.registerKeybinding({
             command: EditContributions.Commands.FIND_NEXT.id,
-            keybinding: 'CtrlCmd+G'
+            keybinding: 'CtrlCmd+G',
         });
         registry.registerKeybinding({
             command: EditContributions.Commands.FIND_PREVIOUS.id,
-            keybinding: 'CtrlCmd+Shift+G'
+            keybinding: 'CtrlCmd+Shift+G',
         });
         registry.registerKeybinding({
             command: EditContributions.Commands.USE_FOR_FIND.id,
-            keybinding: 'CtrlCmd+E'
+            keybinding: 'CtrlCmd+E',
         });
 
         // `Tools`
         registry.registerKeybinding({
             command: EditContributions.Commands.AUTO_FORMAT.id,
-            keybinding: 'CtrlCmd+T'
+            keybinding: 'CtrlCmd+T',
         });
     }
 
     protected async current(): Promise<monaco.editor.ICodeEditor | undefined> {
-        return this.codeEditorService.getFocusedCodeEditor() || this.codeEditorService.getActiveCodeEditor();
+        return (
+            this.codeEditorService.getFocusedCodeEditor() ||
+            this.codeEditorService.getActiveCodeEditor()
+        );
     }
 
     protected async currentValue(): Promise<string | undefined> {
@@ -229,49 +280,48 @@ ${value}
             }
         }
     }
-
 }
 
 export namespace EditContributions {
     export namespace Commands {
         export const COPY_FOR_FORUM: Command = {
-            id: 'arduino-copy-for-forum'
+            id: 'arduino-copy-for-forum',
         };
         export const COPY_FOR_GITHUB: Command = {
-            id: 'arduino-copy-for-github'
+            id: 'arduino-copy-for-github',
         };
         export const GO_TO_LINE: Command = {
-            id: 'arduino-go-to-line'
+            id: 'arduino-go-to-line',
         };
         export const TOGGLE_COMMENT: Command = {
-            id: 'arduino-toggle-comment'
+            id: 'arduino-toggle-comment',
         };
         export const INDENT_LINES: Command = {
-            id: 'arduino-indent-lines'
+            id: 'arduino-indent-lines',
         };
         export const OUTDENT_LINES: Command = {
-            id: 'arduino-outdent-lines'
+            id: 'arduino-outdent-lines',
         };
         export const FIND: Command = {
-            id: 'arduino-find'
+            id: 'arduino-find',
         };
         export const FIND_NEXT: Command = {
-            id: 'arduino-find-next'
+            id: 'arduino-find-next',
         };
         export const FIND_PREVIOUS: Command = {
-            id: 'arduino-find-previous'
+            id: 'arduino-find-previous',
         };
         export const USE_FOR_FIND: Command = {
-            id: 'arduino-for-find'
+            id: 'arduino-for-find',
         };
         export const INCREASE_FONT_SIZE: Command = {
-            id: 'arduino-increase-font-size'
+            id: 'arduino-increase-font-size',
         };
         export const DECREASE_FONT_SIZE: Command = {
-            id: 'arduino-decrease-font-size'
+            id: 'arduino-decrease-font-size',
         };
         export const AUTO_FORMAT: Command = {
-            id: 'arduino-auto-format' // `Auto Format` should belong to `Tool`.
+            id: 'arduino-auto-format', // `Auto Format` should belong to `Tool`.
         };
     }
 }

arduino-ide-extension/src/browser/contributions/examples.ts

@@ -1,18 +1,30 @@
 import * as PQueue from 'p-queue';
 import { inject, injectable, postConstruct } from 'inversify';
-import { MenuPath, SubMenuOptions, CompositeMenuNode } from '@theia/core/lib/common/menu';
-import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
+import { CommandHandler } from '@theia/core/lib/common/command';
+import {
+    MenuPath,
+    CompositeMenuNode,
+    SubMenuOptions,
+} from '@theia/core/lib/common/menu';
+import {
+    Disposable,
+    DisposableCollection,
+} from '@theia/core/lib/common/disposable';
 import { OpenSketch } from './open-sketch';
-import { ArduinoMenus } from '../menu/arduino-menus';
+import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
 import { MainMenuManager } from '../../common/main-menu-manager';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import { ExamplesService, ExampleContainer } from '../../common/protocol/examples-service';
-import { SketchContribution, CommandRegistry, MenuModelRegistry } from './contribution';
+import { ExamplesService } from '../../common/protocol/examples-service';
+import {
+    SketchContribution,
+    CommandRegistry,
+    MenuModelRegistry,
+} from './contribution';
 import { NotificationCenter } from '../notification-center';
+import { Board, Sketch, SketchContainer } from '../../common/protocol';
 
 @injectable()
 export abstract class Examples extends SketchContribution {
-
     @inject(CommandRegistry)
     protected readonly commandRegistry: CommandRegistry;
 
@@ -32,10 +44,12 @@ export abstract class Examples extends SketchContribution {
 
     @postConstruct()
     init(): void {
-        this.boardsServiceClient.onBoardsConfigChanged(({ selectedBoard }) => this.handleBoardChanged(selectedBoard?.fqbn));
+        this.boardsServiceClient.onBoardsConfigChanged(({ selectedBoard }) =>
+            this.handleBoardChanged(selectedBoard)
+        );
     }
 
-    protected handleBoardChanged(fqbn: string | undefined): void {
+    protected handleBoardChanged(board: Board | undefined): void {
         // NOOP
     }
 
@@ -44,8 +58,13 @@ export abstract class Examples extends SketchContribution {
             // This is a hack the ensures the desired menu ordering! We cannot use https://github.com/eclipse-theia/theia/pull/8377 due to ATL-222.
             const index = ArduinoMenus.FILE__EXAMPLES_SUBMENU.length - 1;
             const menuId = ArduinoMenus.FILE__EXAMPLES_SUBMENU[index];
-            const groupPath = index === 0 ? [] : ArduinoMenus.FILE__EXAMPLES_SUBMENU.slice(0, index);
-            const parent: CompositeMenuNode = (registry as any).findGroup(groupPath);
+            const groupPath =
+                index === 0
+                    ? []
+                    : ArduinoMenus.FILE__EXAMPLES_SUBMENU.slice(0, index);
+            const parent: CompositeMenuNode = (registry as any).findGroup(
+                groupPath
+            );
             const examples = new CompositeMenuNode(menuId, '', { order: '4' });
             parent.addNode(examples);
         } catch (e) {
@@ -54,65 +73,128 @@ export abstract class Examples extends SketchContribution {
         }
         // Registering the same submenu multiple times has no side-effect.
         // TODO: unregister submenu? https://github.com/eclipse-theia/theia/issues/7300
-        registry.registerSubmenu(ArduinoMenus.FILE__EXAMPLES_SUBMENU, 'Examples', { order: '4' });
+        registry.registerSubmenu(
+            ArduinoMenus.FILE__EXAMPLES_SUBMENU,
+            'Examples',
+            { order: '4' }
+        );
     }
 
     registerRecursively(
-        exampleContainer: ExampleContainer,
+        sketchContainerOrPlaceholder:
+            | SketchContainer
+            | (Sketch | SketchContainer)[]
+            | string,
         menuPath: MenuPath,
         pushToDispose: DisposableCollection = new DisposableCollection(),
-        options?: SubMenuOptions): void {
+        subMenuOptions?: SubMenuOptions | undefined
+    ): void {
+        if (typeof sketchContainerOrPlaceholder === 'string') {
+            const placeholder = new PlaceholderMenuNode(
+                menuPath,
+                sketchContainerOrPlaceholder
+            );
+            this.menuRegistry.registerMenuNode(menuPath, placeholder);
+            pushToDispose.push(
+                Disposable.create(() =>
+                    this.menuRegistry.unregisterMenuNode(placeholder.id)
+                )
+            );
+        } else {
+            const sketches: Sketch[] = [];
+            const children: SketchContainer[] = [];
+            let submenuPath = menuPath;
 
-        const { label, sketches, children } = exampleContainer;
-        const submenuPath = [...menuPath, label];
-        this.menuRegistry.registerSubmenu(submenuPath, label, options);
-        children.forEach(child => this.registerRecursively(child, submenuPath, pushToDispose));
-        for (const sketch of sketches) {
-            const { uri } = sketch;
-            const commandId = `arduino-open-example-${submenuPath.join(':')}--${uri}`;
-            const command = { id: commandId };
-            const handler = {
-                execute: async () => {
-                    const sketch = await this.sketchService.cloneExample(uri);
-                    this.commandService.executeCommand(OpenSketch.Commands.OPEN_SKETCH.id, sketch);
+            if (SketchContainer.is(sketchContainerOrPlaceholder)) {
+                const { label } = sketchContainerOrPlaceholder;
+                submenuPath = [...menuPath, label];
+                this.menuRegistry.registerSubmenu(
+                    submenuPath,
+                    label,
+                    subMenuOptions
+                );
+                sketches.push(...sketchContainerOrPlaceholder.sketches);
+                children.push(...sketchContainerOrPlaceholder.children);
+            } else {
+                for (const sketchOrContainer of sketchContainerOrPlaceholder) {
+                    if (SketchContainer.is(sketchOrContainer)) {
+                        children.push(sketchOrContainer);
+                    } else {
+                        sketches.push(sketchOrContainer);
+                    }
                 }
-            };
-            pushToDispose.push(this.commandRegistry.registerCommand(command, handler));
-            this.menuRegistry.registerMenuAction(submenuPath, { commandId, label: sketch.name });
-            pushToDispose.push(Disposable.create(() => this.menuRegistry.unregisterMenuAction(command)));
+            }
+            children.forEach((child) =>
+                this.registerRecursively(child, submenuPath, pushToDispose)
+            );
+            for (const sketch of sketches) {
+                const { uri } = sketch;
+                const commandId = `arduino-open-example-${submenuPath.join(
+                    ':'
+                )}--${uri}`;
+                const command = { id: commandId };
+                const handler = this.createHandler(uri);
+                pushToDispose.push(
+                    this.commandRegistry.registerCommand(command, handler)
+                );
+                this.menuRegistry.registerMenuAction(submenuPath, {
+                    commandId,
+                    label: sketch.name,
+                    order: sketch.name.toLocaleLowerCase(),
+                });
+                pushToDispose.push(
+                    Disposable.create(() =>
+                        this.menuRegistry.unregisterMenuAction(command)
+                    )
+                );
+            }
         }
     }
 
+    protected createHandler(uri: string): CommandHandler {
+        return {
+            execute: async () => {
+                const sketch = await this.sketchService.cloneExample(uri);
+                return this.commandService.executeCommand(
+                    OpenSketch.Commands.OPEN_SKETCH.id,
+                    sketch
+                );
+            },
+        };
+    }
 }
 
 @injectable()
 export class BuiltInExamples extends Examples {
-
     onStart(): void {
         this.register(); // no `await`
     }
 
-    protected async register() {
-        let exampleContainers: ExampleContainer[] | undefined;
+    protected async register(): Promise<void> {
+        let sketchContainers: SketchContainer[] | undefined;
         try {
-            exampleContainers = await this.examplesService.builtIns();
+            sketchContainers = await this.examplesService.builtIns();
         } catch (e) {
             console.error('Could not initialize built-in examples.', e);
-            this.messageService.error('Could not initialize built-in examples.');
+            this.messageService.error(
+                'Could not initialize built-in examples.'
+            );
             return;
         }
         this.toDispose.dispose();
-        for (const container of exampleContainers) {
-            this.registerRecursively(container, ArduinoMenus.EXAMPLES__BUILT_IN_GROUP, this.toDispose);
+        for (const container of ['Built-in examples', ...sketchContainers]) {
+            this.registerRecursively(
+                container,
+                ArduinoMenus.EXAMPLES__BUILT_IN_GROUP,
+                this.toDispose
+            );
         }
         this.menuManager.update();
     }
-
 }
 
 @injectable()
 export class LibraryExamples extends Examples {
-
     @inject(NotificationCenter)
     protected readonly notificationCenter: NotificationCenter;
 
@@ -124,28 +206,53 @@ export class LibraryExamples extends Examples {
         this.notificationCenter.onLibraryUninstalled(() => this.register());
     }
 
-    protected handleBoardChanged(fqbn: string | undefined): void {
-        this.register(fqbn);
+    protected handleBoardChanged(board: Board | undefined): void {
+        this.register(board);
     }
 
-    protected async register(fqbn: string | undefined = this.boardsServiceClient.boardsConfig.selectedBoard?.fqbn) {
+    protected async register(
+        board: Board | undefined = this.boardsServiceClient.boardsConfig
+            .selectedBoard
+    ): Promise<void> {
         return this.queue.add(async () => {
             this.toDispose.dispose();
-            if (!fqbn) {
-                return;
+            const fqbn = board?.fqbn;
+            const name = board?.name;
+            // Shows all examples when no board is selected, or the platform of the currently selected board is not installed.
+            const { user, current, any } = await this.examplesService.installed(
+                { fqbn }
+            );
+            if (user.length) {
+                (user as any).unshift('Examples from Custom Libraries');
+            }
+            if (name && fqbn && current.length) {
+                (current as any).unshift(`Examples for ${name}`);
+            }
+            if (any.length) {
+                (any as any).unshift('Examples for any board');
             }
-            const { user, current, any } = await this.examplesService.installed({ fqbn });
             for (const container of user) {
-                this.registerRecursively(container, ArduinoMenus.EXAMPLES__USER_LIBS_GROUP, this.toDispose);
+                this.registerRecursively(
+                    container,
+                    ArduinoMenus.EXAMPLES__USER_LIBS_GROUP,
+                    this.toDispose
+                );
             }
             for (const container of current) {
-                this.registerRecursively(container, ArduinoMenus.EXAMPLES__CURRENT_BOARD_GROUP, this.toDispose);
+                this.registerRecursively(
+                    container,
+                    ArduinoMenus.EXAMPLES__CURRENT_BOARD_GROUP,
+                    this.toDispose
+                );
             }
             for (const container of any) {
-                this.registerRecursively(container, ArduinoMenus.EXAMPLES__ANY_BOARD_GROUP, this.toDispose);
+                this.registerRecursively(
+                    container,
+                    ArduinoMenus.EXAMPLES__ANY_BOARD_GROUP,
+                    this.toDispose
+                );
             }
             this.menuManager.update();
         });
     }
-
 }

arduino-ide-extension/src/browser/contributions/help.ts

@@ -0,0 +1,172 @@
+import { inject, injectable } from 'inversify';
+import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
+import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
+import { WindowService } from '@theia/core/lib/browser/window/window-service';
+import { CommandHandler } from '@theia/core/lib/common/command';
+import { QuickInputService } from '@theia/core/lib/browser/quick-open/quick-input-service';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import {
+    Contribution,
+    Command,
+    MenuModelRegistry,
+    CommandRegistry,
+    KeybindingRegistry,
+} from './contribution';
+
+@injectable()
+export class Help extends Contribution {
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
+
+    @inject(WindowService)
+    protected readonly windowService: WindowService;
+
+    @inject(QuickInputService)
+    protected readonly quickInputService: QuickInputService;
+
+    registerCommands(registry: CommandRegistry): void {
+        const open = (url: string) =>
+            this.windowService.openNewWindow(url, { external: true });
+        const createOpenHandler = (url: string) =>
+            <CommandHandler>{
+                execute: () => open(url),
+            };
+        registry.registerCommand(
+            Help.Commands.GETTING_STARTED,
+            createOpenHandler('https://www.arduino.cc/en/Guide')
+        );
+        registry.registerCommand(
+            Help.Commands.ENVIRONMENT,
+            createOpenHandler('https://www.arduino.cc/en/Guide/Environment')
+        );
+        registry.registerCommand(
+            Help.Commands.TROUBLESHOOTING,
+            createOpenHandler('https://support.arduino.cc/hc/en-us')
+        );
+        registry.registerCommand(
+            Help.Commands.REFERENCE,
+            createOpenHandler('https://www.arduino.cc/reference/en/')
+        );
+        registry.registerCommand(Help.Commands.FIND_IN_REFERENCE, {
+            execute: async () => {
+                let searchFor: string | undefined = undefined;
+                const { currentEditor } = this.editorManager;
+                if (
+                    currentEditor &&
+                    currentEditor.editor instanceof MonacoEditor
+                ) {
+                    const codeEditor = currentEditor.editor.getControl();
+                    const selection = codeEditor.getSelection();
+                    const model = codeEditor.getModel();
+                    if (
+                        model &&
+                        selection &&
+                        !monaco.Range.isEmpty(selection)
+                    ) {
+                        searchFor = model.getValueInRange(selection);
+                    }
+                }
+                if (!searchFor) {
+                    searchFor = await this.quickInputService.open({
+                        prompt: 'Search on Arduino.cc',
+                        placeHolder: 'Type a keyword',
+                    });
+                }
+                if (searchFor) {
+                    return open(
+                        `https://www.arduino.cc/search?q=${encodeURIComponent(
+                            searchFor
+                        )}&tab=reference`
+                    );
+                }
+            },
+        });
+        registry.registerCommand(
+            Help.Commands.FAQ,
+            createOpenHandler('https://support.arduino.cc/hc/en-us')
+        );
+        registry.registerCommand(
+            Help.Commands.VISIT_ARDUINO,
+            createOpenHandler('https://www.arduino.cc/')
+        );
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.HELP__MAIN_GROUP, {
+            commandId: Help.Commands.GETTING_STARTED.id,
+            order: '0',
+        });
+        registry.registerMenuAction(ArduinoMenus.HELP__MAIN_GROUP, {
+            commandId: Help.Commands.ENVIRONMENT.id,
+            order: '1',
+        });
+        registry.registerMenuAction(ArduinoMenus.HELP__MAIN_GROUP, {
+            commandId: Help.Commands.TROUBLESHOOTING.id,
+            order: '2',
+        });
+        registry.registerMenuAction(ArduinoMenus.HELP__MAIN_GROUP, {
+            commandId: Help.Commands.REFERENCE.id,
+            order: '3',
+        });
+
+        registry.registerMenuAction(ArduinoMenus.HELP__FIND_GROUP, {
+            commandId: Help.Commands.FIND_IN_REFERENCE.id,
+            order: '4',
+        });
+        registry.registerMenuAction(ArduinoMenus.HELP__FIND_GROUP, {
+            commandId: Help.Commands.FAQ.id,
+            order: '5',
+        });
+        registry.registerMenuAction(ArduinoMenus.HELP__FIND_GROUP, {
+            commandId: Help.Commands.VISIT_ARDUINO.id,
+            order: '6',
+        });
+    }
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybinding({
+            command: Help.Commands.FIND_IN_REFERENCE.id,
+            keybinding: 'CtrlCmd+Shift+F',
+        });
+    }
+}
+
+export namespace Help {
+    export namespace Commands {
+        export const GETTING_STARTED: Command = {
+            id: 'arduino-getting-started',
+            label: 'Getting Started',
+            category: 'Arduino',
+        };
+        export const ENVIRONMENT: Command = {
+            id: 'arduino-environment',
+            label: 'Environment',
+            category: 'Arduino',
+        };
+        export const TROUBLESHOOTING: Command = {
+            id: 'arduino-troubleshooting',
+            label: 'Troubleshooting',
+            category: 'Arduino',
+        };
+        export const REFERENCE: Command = {
+            id: 'arduino-reference',
+            label: 'Reference',
+            category: 'Arduino',
+        };
+        export const FIND_IN_REFERENCE: Command = {
+            id: 'arduino-find-in-reference',
+            label: 'Find in Reference',
+            category: 'Arduino',
+        };
+        export const FAQ: Command = {
+            id: 'arduino-faq',
+            label: 'Frequently Asked Questions',
+            category: 'Arduino',
+        };
+        export const VISIT_ARDUINO: Command = {
+            id: 'arduino-visit-arduino',
+            label: 'Visit Arduino.cc',
+            category: 'Arduino',
+        };
+    }
+}

arduino-ide-extension/src/browser/contributions/include-library.ts

@@ -4,9 +4,12 @@ import URI from '@theia/core/lib/common/uri';
 import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
 import { EditorManager } from '@theia/editor/lib/browser';
 import { MenuModelRegistry, MenuPath } from '@theia/core/lib/common/menu';
-import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
-import { ArduinoMenus } from '../menu/arduino-menus';
-import { LibraryPackage, LibraryLocation, LibraryService } from '../../common/protocol';
+import {
+    Disposable,
+    DisposableCollection,
+} from '@theia/core/lib/common/disposable';
+import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
+import { LibraryPackage, LibraryService } from '../../common/protocol';
 import { MainMenuManager } from '../../common/main-menu-manager';
 import { LibraryListWidget } from '../library/library-list-widget';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
@@ -15,7 +18,6 @@ import { NotificationCenter } from '../notification-center';
 
 @injectable()
 export class IncludeLibrary extends SketchContribution {
-
     @inject(CommandRegistry)
     protected readonly commandRegistry: CommandRegistry;
 
@@ -42,18 +44,40 @@ export class IncludeLibrary extends SketchContribution {
 
     onStart(): void {
         this.updateMenuActions();
-        this.boardsServiceClient.onBoardsConfigChanged(() => this.updateMenuActions())
-        this.notificationCenter.onLibraryInstalled(() => this.updateMenuActions());
-        this.notificationCenter.onLibraryUninstalled(() => this.updateMenuActions());
+        this.boardsServiceClient.onBoardsConfigChanged(() =>
+            this.updateMenuActions()
+        );
+        this.notificationCenter.onLibraryInstalled(() =>
+            this.updateMenuActions()
+        );
+        this.notificationCenter.onLibraryUninstalled(() =>
+            this.updateMenuActions()
+        );
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        // `Include Library` submenu
+        const includeLibMenuPath = [
+            ...ArduinoMenus.SKETCH__UTILS_GROUP,
+            '0_include',
+        ];
+        registry.registerSubmenu(includeLibMenuPath, 'Include Library', {
+            order: '1',
+        });
+        // `Manage Libraries...` group.
+        registry.registerMenuAction([...includeLibMenuPath, '0_manage'], {
+            commandId: `${LibraryListWidget.WIDGET_ID}:toggle`,
+            label: 'Manage Libraries...',
+        });
     }
 
     registerCommands(registry: CommandRegistry): void {
         registry.registerCommand(IncludeLibrary.Commands.INCLUDE_LIBRARY, {
-            execute: async arg => {
+            execute: async (arg) => {
                 if (LibraryPackage.is(arg)) {
                     this.includeLibrary(arg);
                 }
-            }
+            },
         });
     }
 
@@ -61,46 +85,76 @@ export class IncludeLibrary extends SketchContribution {
         return this.queue.add(async () => {
             this.toDispose.dispose();
             this.mainMenuManager.update();
-            const libraries: LibraryPackage[] = []
-            const fqbn = this.boardsServiceClient.boardsConfig.selectedBoard?.fqbn;
-            // Do not show board specific examples, when no board is selected.
-            if (fqbn) {
-                libraries.push(...await this.libraryService.list({ fqbn }));
-            }
-
-            // `Include Library` submenu
-            const includeLibMenuPath = [...ArduinoMenus.SKETCH__UTILS_GROUP, '0_include'];
-            this.menuRegistry.registerSubmenu(includeLibMenuPath, 'Include Library', { order: '1' });
-            // `Manage Libraries...` group.
-            this.menuRegistry.registerMenuAction([...includeLibMenuPath, '0_manage'], {
-                commandId: `${LibraryListWidget.WIDGET_ID}:toggle`,
-                label: 'Manage Libraries...'
-            });
-            this.toDispose.push(Disposable.create(() => this.menuRegistry.unregisterMenuAction({ commandId: `${LibraryListWidget.WIDGET_ID}:toggle` })));
+            const libraries: LibraryPackage[] = [];
+            const fqbn =
+                this.boardsServiceClient.boardsConfig.selectedBoard?.fqbn;
+            // Show all libraries, when no board is selected.
+            // Otherwise, show libraries only for the selected board.
+            libraries.push(...(await this.libraryService.list({ fqbn })));
 
+            const includeLibMenuPath = [
+                ...ArduinoMenus.SKETCH__UTILS_GROUP,
+                '0_include',
+            ];
             // `Add .ZIP Library...`
             // TODO: implement it
 
             // `Arduino libraries`
             const packageMenuPath = [...includeLibMenuPath, '2_arduino'];
             const userMenuPath = [...includeLibMenuPath, '3_contributed'];
-            for (const library of libraries) {
-                this.toDispose.push(this.registerLibrary(library, library.location === LibraryLocation.USER ? userMenuPath : packageMenuPath));
+            const { user, rest } = LibraryPackage.groupByLocation(libraries);
+            if (rest.length) {
+                (rest as any).unshift('Arduino libraries');
+            }
+            if (user.length) {
+                (user as any).unshift('Contributed libraries');
+            }
+
+            for (const library of user) {
+                this.toDispose.push(
+                    this.registerLibrary(library, userMenuPath)
+                );
+            }
+            for (const library of rest) {
+                this.toDispose.push(
+                    this.registerLibrary(library, packageMenuPath)
+                );
             }
 
             this.mainMenuManager.update();
         });
     }
 
-    protected registerLibrary(library: LibraryPackage, menuPath: MenuPath): Disposable {
-        const commandId = `arduino-include-library--${library.name}:${library.author}`;
+    protected registerLibrary(
+        libraryOrPlaceholder: LibraryPackage | string,
+        menuPath: MenuPath
+    ): Disposable {
+        if (typeof libraryOrPlaceholder === 'string') {
+            const placeholder = new PlaceholderMenuNode(
+                menuPath,
+                libraryOrPlaceholder
+            );
+            this.menuRegistry.registerMenuNode(menuPath, placeholder);
+            return Disposable.create(() =>
+                this.menuRegistry.unregisterMenuNode(placeholder.id)
+            );
+        }
+        const commandId = `arduino-include-library--${libraryOrPlaceholder.name}:${libraryOrPlaceholder.author}`;
         const command = { id: commandId };
-        const handler = { execute: () => this.commandRegistry.executeCommand(IncludeLibrary.Commands.INCLUDE_LIBRARY.id, library) };
-        const menuAction = { commandId, label: library.name };
+        const handler = {
+            execute: () =>
+                this.commandRegistry.executeCommand(
+                    IncludeLibrary.Commands.INCLUDE_LIBRARY.id,
+                    libraryOrPlaceholder
+                ),
+        };
+        const menuAction = { commandId, label: libraryOrPlaceholder.name };
         this.menuRegistry.registerMenuAction(menuPath, menuAction);
         return new DisposableCollection(
             this.commandRegistry.registerCommand(command, handler),
-            Disposable.create(() => this.menuRegistry.unregisterMenuAction(menuAction)),
+            Disposable.create(() =>
+                this.menuRegistry.unregisterMenuAction(menuAction)
+            )
         );
     }
 
@@ -114,13 +168,19 @@ export class IncludeLibrary extends SketchContribution {
         let codeEditor: monaco.editor.IStandaloneCodeEditor | undefined;
         const editor = this.editorManager.currentEditor?.editor;
         if (editor instanceof MonacoEditor) {
-            if (sketch.additionalFileUris.some(uri => uri === editor.uri.toString())) {
+            if (
+                sketch.additionalFileUris.some(
+                    (uri) => uri === editor.uri.toString()
+                )
+            ) {
                 codeEditor = editor.getControl();
             }
         }
 
         if (!codeEditor) {
-            const widget = await this.editorManager.open(new URI(sketch.mainFileUri));
+            const widget = await this.editorManager.open(
+                new URI(sketch.mainFileUri)
+            );
             if (widget.editor instanceof MonacoEditor) {
                 codeEditor = widget.editor.getControl();
             }
@@ -138,22 +198,29 @@ export class IncludeLibrary extends SketchContribution {
         const eol = textModel.getEOL();
         const includes = library.includes.slice();
         includes.push(''); // For the trailing new line.
-        const text = includes.map(include => include ? `#include <${include}>` : eol).join(eol);
+        const text = includes
+            .map((include) => (include ? `#include <${include}>` : eol))
+            .join(eol);
         textModel.pushStackElement(); // Start a fresh operation.
-        textModel.pushEditOperations(cursorState, [{
-            range: new monaco.Range(1, 1, 1, 1),
-            text,
-            forceMoveMarkers: true
-        }], () => cursorState);
+        textModel.pushEditOperations(
+            cursorState,
+            [
+                {
+                    range: new monaco.Range(1, 1, 1, 1),
+                    text,
+                    forceMoveMarkers: true,
+                },
+            ],
+            () => cursorState
+        );
         textModel.pushStackElement(); // Make it undoable.
     }
-
 }
 
 export namespace IncludeLibrary {
     export namespace Commands {
         export const INCLUDE_LIBRARY: Command = {
-            id: 'arduino-include-library'
+            id: 'arduino-include-library',
         };
     }
 }

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

@@ -1,18 +1,27 @@
 import { injectable } from 'inversify';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
-import { SketchContribution, URI, Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, TabBarToolbarRegistry } from './contribution';
+import {
+    SketchContribution,
+    URI,
+    Command,
+    CommandRegistry,
+    MenuModelRegistry,
+    KeybindingRegistry,
+    TabBarToolbarRegistry,
+} from './contribution';
 
 @injectable()
 export class NewSketch extends SketchContribution {
-
     registerCommands(registry: CommandRegistry): void {
         registry.registerCommand(NewSketch.Commands.NEW_SKETCH, {
-            execute: () => this.newSketch()
+            execute: () => this.newSketch(),
         });
         registry.registerCommand(NewSketch.Commands.NEW_SKETCH__TOOLBAR, {
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
-            execute: () => registry.executeCommand(NewSketch.Commands.NEW_SKETCH.id)
+            isVisible: (widget) =>
+                ArduinoToolbar.is(widget) && widget.side === 'left',
+            execute: () =>
+                registry.executeCommand(NewSketch.Commands.NEW_SKETCH.id),
         });
     }
 
@@ -20,14 +29,14 @@ export class NewSketch extends SketchContribution {
         registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
             commandId: NewSketch.Commands.NEW_SKETCH.id,
             label: 'New',
-            order: '0'
+            order: '0',
         });
     }
 
     registerKeybindings(registry: KeybindingRegistry): void {
         registry.registerKeybinding({
             command: NewSketch.Commands.NEW_SKETCH.id,
-            keybinding: 'CtrlCmd+N'
+            keybinding: 'CtrlCmd+N',
         });
     }
 
@@ -36,7 +45,7 @@ export class NewSketch extends SketchContribution {
             id: NewSketch.Commands.NEW_SKETCH__TOOLBAR.id,
             command: NewSketch.Commands.NEW_SKETCH__TOOLBAR.id,
             tooltip: 'New',
-            priority: 3
+            priority: 3,
         });
     }
 
@@ -48,16 +57,15 @@ export class NewSketch extends SketchContribution {
             await this.messageService.error(e.toString());
         }
     }
-
 }
 
 export namespace NewSketch {
     export namespace Commands {
         export const NEW_SKETCH: Command = {
-            id: 'arduino-new-sketch'
+            id: 'arduino-new-sketch',
         };
         export const NEW_SKETCH__TOOLBAR: Command = {
-            id: 'arduino-new-sketch--toolbar'
+            id: 'arduino-new-sketch--toolbar',
         };
     }
 }

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

@@ -0,0 +1,94 @@
+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 {
+        const 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/open-sketch-external.ts

@@ -2,14 +2,19 @@ import { injectable } from 'inversify';
 import { remote } from 'electron';
 import URI from '@theia/core/lib/common/uri';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import { SketchContribution, Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry } from './contribution';
+import {
+    SketchContribution,
+    Command,
+    CommandRegistry,
+    MenuModelRegistry,
+    KeybindingRegistry,
+} from './contribution';
 
 @injectable()
 export class OpenSketchExternal extends SketchContribution {
-
     registerCommands(registry: CommandRegistry): void {
         registry.registerCommand(OpenSketchExternal.Commands.OPEN_EXTERNAL, {
-            execute: () => this.openExternal()
+            execute: () => this.openExternal(),
         });
     }
 
@@ -17,14 +22,14 @@ export class OpenSketchExternal extends SketchContribution {
         registry.registerMenuAction(ArduinoMenus.SKETCH__UTILS_GROUP, {
             commandId: OpenSketchExternal.Commands.OPEN_EXTERNAL.id,
             label: 'Show Sketch Folder',
-            order: '0'
+            order: '0',
         });
     }
 
     registerKeybindings(registry: KeybindingRegistry): void {
         registry.registerKeybinding({
             command: OpenSketchExternal.Commands.OPEN_EXTERNAL.id,
-            keybinding: 'CtrlCmd+Alt+K'
+            keybinding: 'CtrlCmd+Alt+K',
         });
     }
 
@@ -40,13 +45,12 @@ export class OpenSketchExternal extends SketchContribution {
             }
         }
     }
-
 }
 
 export namespace OpenSketchExternal {
     export namespace Commands {
         export const OPEN_EXTERNAL: Command = {
-            id: 'arduino-open-sketch-external'
+            id: 'arduino-open-sketch-external',
         };
     }
 }

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

@@ -2,16 +2,29 @@ import { inject, injectable } from 'inversify';
 import { remote } from 'electron';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { Widget, ContextMenuRenderer } from '@theia/core/lib/browser';
-import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
+import {
+    Disposable,
+    DisposableCollection,
+} from '@theia/core/lib/common/disposable';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
-import { SketchContribution, Sketch, URI, Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, TabBarToolbarRegistry } from './contribution';
+import {
+    SketchContribution,
+    Sketch,
+    URI,
+    Command,
+    CommandRegistry,
+    MenuModelRegistry,
+    KeybindingRegistry,
+    TabBarToolbarRegistry,
+} from './contribution';
 import { ExamplesService } from '../../common/protocol/examples-service';
 import { BuiltInExamples } from './examples';
+import { Sketchbook } from './sketchbook';
+import { SketchContainer } from '../../common/protocol';
 
 @injectable()
 export class OpenSketch extends SketchContribution {
-
     @inject(MenuModelRegistry)
     protected readonly menuRegistry: MenuModelRegistry;
 
@@ -24,20 +37,27 @@ export class OpenSketch extends SketchContribution {
     @inject(ExamplesService)
     protected readonly examplesService: ExamplesService;
 
-    protected readonly toDisposeBeforeCreateNewContextMenu = new DisposableCollection();
+    @inject(Sketchbook)
+    protected readonly sketchbook: Sketchbook;
+
+    protected readonly toDispose = new DisposableCollection();
 
     registerCommands(registry: CommandRegistry): void {
         registry.registerCommand(OpenSketch.Commands.OPEN_SKETCH, {
-            execute: arg => Sketch.is(arg) ? this.openSketch(arg) : this.openSketch()
+            execute: (arg) =>
+                Sketch.is(arg) ? this.openSketch(arg) : this.openSketch(),
         });
         registry.registerCommand(OpenSketch.Commands.OPEN_SKETCH__TOOLBAR, {
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
+            isVisible: (widget) =>
+                ArduinoToolbar.is(widget) && widget.side === 'left',
             execute: async (_: Widget, target: EventTarget) => {
-                const sketches = await this.sketchService.getSketches();
-                if (!sketches.length) {
+                const container = await this.sketchService.getSketches({
+                    exclude: ['**/hardware/**'],
+                });
+                if (SketchContainer.isEmpty(container)) {
                     this.openSketch();
                 } else {
-                    this.toDisposeBeforeCreateNewContextMenu.dispose();
+                    this.toDispose.dispose();
                     if (!(target instanceof HTMLElement)) {
                         return;
                     }
@@ -46,39 +66,53 @@ export class OpenSketch extends SketchContribution {
                         return;
                     }
 
-                    this.menuRegistry.registerMenuAction(ArduinoMenus.OPEN_SKETCH__CONTEXT__OPEN_GROUP, {
-                        commandId: OpenSketch.Commands.OPEN_SKETCH.id,
-                        label: 'Open...'
-                    });
-                    this.toDisposeBeforeCreateNewContextMenu.push(Disposable.create(() => this.menuRegistry.unregisterMenuAction(OpenSketch.Commands.OPEN_SKETCH)));
-                    for (const sketch of sketches) {
-                        const command = { id: `arduino-open-sketch--${sketch.uri}` };
-                        const handler = { execute: () => this.openSketch(sketch) };
-                        this.toDisposeBeforeCreateNewContextMenu.push(registry.registerCommand(command, handler));
-                        this.menuRegistry.registerMenuAction(ArduinoMenus.OPEN_SKETCH__CONTEXT__RECENT_GROUP, {
-                            commandId: command.id,
-                            label: sketch.name
-                        });
-                        this.toDisposeBeforeCreateNewContextMenu.push(Disposable.create(() => this.menuRegistry.unregisterMenuAction(command)));
-                    }
+                    this.menuRegistry.registerMenuAction(
+                        ArduinoMenus.OPEN_SKETCH__CONTEXT__OPEN_GROUP,
+                        {
+                            commandId: OpenSketch.Commands.OPEN_SKETCH.id,
+                            label: 'Open...',
+                        }
+                    );
+                    this.toDispose.push(
+                        Disposable.create(() =>
+                            this.menuRegistry.unregisterMenuAction(
+                                OpenSketch.Commands.OPEN_SKETCH
+                            )
+                        )
+                    );
+                    this.sketchbook.registerRecursively(
+                        [...container.children, ...container.sketches],
+                        ArduinoMenus.OPEN_SKETCH__CONTEXT__RECENT_GROUP,
+                        this.toDispose
+                    );
                     try {
-                        const containers = await this.examplesService.builtIns();
+                        const containers =
+                            await this.examplesService.builtIns();
                         for (const container of containers) {
-                            this.builtInExamples.registerRecursively(container, ArduinoMenus.OPEN_SKETCH__CONTEXT__EXAMPLES_GROUP, this.toDisposeBeforeCreateNewContextMenu);
+                            this.builtInExamples.registerRecursively(
+                                container,
+                                ArduinoMenus.OPEN_SKETCH__CONTEXT__EXAMPLES_GROUP,
+                                this.toDispose
+                            );
                         }
                     } catch (e) {
-                        console.error('Error when collecting built-in examples.', e);
+                        console.error(
+                            'Error when collecting built-in examples.',
+                            e
+                        );
                     }
                     const options = {
                         menuPath: ArduinoMenus.OPEN_SKETCH__CONTEXT,
                         anchor: {
                             x: parentElement.getBoundingClientRect().left,
-                            y: parentElement.getBoundingClientRect().top + parentElement.offsetHeight
-                        }
-                    }
+                            y:
+                                parentElement.getBoundingClientRect().top +
+                                parentElement.offsetHeight,
+                        },
+                    };
                     this.contextMenuRenderer.render(options);
                 }
-            }
+            },
         });
     }
 
@@ -86,14 +120,14 @@ export class OpenSketch extends SketchContribution {
         registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
             commandId: OpenSketch.Commands.OPEN_SKETCH.id,
             label: 'Open...',
-            order: '1'
+            order: '1',
         });
     }
 
     registerKeybindings(registry: KeybindingRegistry): void {
         registry.registerKeybinding({
             command: OpenSketch.Commands.OPEN_SKETCH.id,
-            keybinding: 'CtrlCmd+O'
+            keybinding: 'CtrlCmd+O',
         });
     }
 
@@ -102,11 +136,13 @@ export class OpenSketch extends SketchContribution {
             id: OpenSketch.Commands.OPEN_SKETCH__TOOLBAR.id,
             command: OpenSketch.Commands.OPEN_SKETCH__TOOLBAR.id,
             tooltip: 'Open',
-            priority: 4
+            priority: 4,
         });
     }
 
-    async openSketch(toOpen: MaybePromise<Sketch | undefined> = this.selectSketch()): Promise<void> {
+    async openSketch(
+        toOpen: MaybePromise<Sketch | undefined> = this.selectSketch()
+    ): Promise<void> {
         const sketch = await toOpen;
         if (sketch) {
             this.workspaceService.open(new URI(sketch.uri));
@@ -115,22 +151,26 @@ export class OpenSketch extends SketchContribution {
 
     protected async selectSketch(): Promise<Sketch | undefined> {
         const config = await this.configService.getConfiguration();
-        const defaultPath = await this.fileService.fsPath(new URI(config.sketchDirUri));
+        const defaultPath = await this.fileService.fsPath(
+            new URI(config.sketchDirUri)
+        );
         const { filePaths } = await remote.dialog.showOpenDialog({
             defaultPath,
             properties: ['createDirectory', 'openFile'],
             filters: [
                 {
                     name: 'Sketch',
-                    extensions: ['ino']
-                }
-            ]
+                    extensions: ['ino', 'pde'],
+                },
+            ],
         });
         if (!filePaths.length) {
             return undefined;
         }
         if (filePaths.length > 1) {
-            this.logger.warn(`Multiple sketches were selected: ${filePaths}. Using the first one.`);
+            this.logger.warn(
+                `Multiple sketches were selected: ${filePaths}. Using the first one.`
+            );
         }
         const sketchFilePath = filePaths[0];
         const sketchFileUri = await this.fileSystemExt.getUri(sketchFilePath);
@@ -138,42 +178,51 @@ export class OpenSketch extends SketchContribution {
         if (sketch) {
             return sketch;
         }
-        if (sketchFileUri.endsWith('.ino')) {
+        if (Sketch.isSketchFile(sketchFileUri)) {
             const name = new URI(sketchFileUri).path.name;
-            const nameWithExt = this.labelProvider.getName(new URI(sketchFileUri));
+            const nameWithExt = this.labelProvider.getName(
+                new URI(sketchFileUri)
+            );
             const { response } = await remote.dialog.showMessageBox({
                 title: 'Moving',
                 type: 'question',
                 buttons: ['Cancel', 'OK'],
-                message: `The file "${nameWithExt}" needs to be inside a sketch folder named as "${name}".\nCreate this folder, move the file, and continue?`
+                message: `The file "${nameWithExt}" needs to be inside a sketch folder named as "${name}".\nCreate this folder, move the file, and continue?`,
             });
-            if (response === 1) { // OK
-                const newSketchUri = new URI(sketchFileUri).parent.resolve(name);
+            if (response === 1) {
+                // OK
+                const newSketchUri = new URI(sketchFileUri).parent.resolve(
+                    name
+                );
                 const exists = await this.fileService.exists(newSketchUri);
                 if (exists) {
                     await remote.dialog.showMessageBox({
                         type: 'error',
                         title: 'Error',
-                        message: `A folder named "${name}" already exists. Can't open sketch.`
+                        message: `A folder named "${name}" already exists. Can't open sketch.`,
                     });
                     return undefined;
                 }
                 await this.fileService.createFolder(newSketchUri);
-                await this.fileService.move(new URI(sketchFileUri), new URI(newSketchUri.resolve(nameWithExt).toString()));
-                return this.sketchService.getSketchFolder(newSketchUri.toString());
+                await this.fileService.move(
+                    new URI(sketchFileUri),
+                    new URI(newSketchUri.resolve(nameWithExt).toString())
+                );
+                return this.sketchService.getSketchFolder(
+                    newSketchUri.toString()
+                );
             }
         }
     }
-
 }
 
 export namespace OpenSketch {
     export namespace Commands {
         export const OPEN_SKETCH: Command = {
-            id: 'arduino-open-sketch'
+            id: 'arduino-open-sketch',
         };
         export const OPEN_SKETCH__TOOLBAR: Command = {
-            id: 'arduino-open-sketch--toolbar'
+            id: 'arduino-open-sketch--toolbar',
         };
     }
 }

arduino-ide-extension/src/browser/contributions/quit-app.ts

@@ -1,27 +1,32 @@
 import { injectable } from 'inversify';
 import { remote } from 'electron';
 import { isOSX } from '@theia/core/lib/common/os';
-import { Contribution, Command, MenuModelRegistry, KeybindingRegistry, CommandRegistry } from './contribution';
+import {
+    Contribution,
+    Command,
+    MenuModelRegistry,
+    KeybindingRegistry,
+    CommandRegistry,
+} from './contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
 
 @injectable()
 export class QuitApp extends Contribution {
-
     registerCommands(registry: CommandRegistry): void {
         if (!isOSX) {
             registry.registerCommand(QuitApp.Commands.QUIT_APP, {
-                execute: () => remote.app.quit()
+                execute: () => remote.app.quit(),
             });
         }
     }
 
     registerMenus(registry: MenuModelRegistry): void {
-        // On macOS we will get the `Quit ${YOUR_APP_NAME}` menu item natively, no need to duplicate it. 
+        // On macOS we will get the `Quit ${YOUR_APP_NAME}` menu item natively, no need to duplicate it.
         if (!isOSX) {
             registry.registerMenuAction(ArduinoMenus.FILE__QUIT_GROUP, {
                 commandId: QuitApp.Commands.QUIT_APP.id,
                 label: 'Quit',
-                order: '0'
+                order: '0',
             });
         }
     }
@@ -30,17 +35,16 @@ export class QuitApp extends Contribution {
         if (!isOSX) {
             registry.registerKeybinding({
                 command: QuitApp.Commands.QUIT_APP.id,
-                keybinding: 'CtrlCmd+Q'
+                keybinding: 'CtrlCmd+Q',
             });
         }
     }
-
 }
 
 export namespace QuitApp {
     export namespace Commands {
         export const QUIT_APP: Command = {
-            id: 'arduino-quit-app'
+            id: 'arduino-quit-app',
         };
     }
 }

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

@@ -2,14 +2,20 @@ import { injectable } from 'inversify';
 import { remote } from 'electron';
 import * as dateFormat from 'dateformat';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import { SketchContribution, URI, Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry } from './contribution';
+import {
+    SketchContribution,
+    URI,
+    Command,
+    CommandRegistry,
+    MenuModelRegistry,
+    KeybindingRegistry,
+} from './contribution';
 
 @injectable()
 export class SaveAsSketch extends SketchContribution {
-
     registerCommands(registry: CommandRegistry): void {
         registry.registerCommand(SaveAsSketch.Commands.SAVE_AS_SKETCH, {
-            execute: args => this.saveAs(args)
+            execute: (args) => this.saveAs(args),
         });
     }
 
@@ -17,21 +23,27 @@ export class SaveAsSketch extends SketchContribution {
         registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
             commandId: SaveAsSketch.Commands.SAVE_AS_SKETCH.id,
             label: 'Save As...',
-            order: '7'
+            order: '7',
         });
     }
 
     registerKeybindings(registry: KeybindingRegistry): void {
         registry.registerKeybinding({
             command: SaveAsSketch.Commands.SAVE_AS_SKETCH.id,
-            keybinding: 'CtrlCmd+Shift+S'
+            keybinding: 'CtrlCmd+Shift+S',
         });
     }
 
     /**
      * Resolves `true` if the sketch was successfully saved as something.
      */
-    async saveAs({ execOnlyIfTemp, openAfterMove, wipeOriginal }: SaveAsSketch.Options = SaveAsSketch.Options.DEFAULT): Promise<boolean> {
+    async saveAs(
+        {
+            execOnlyIfTemp,
+            openAfterMove,
+            wipeOriginal,
+        }: SaveAsSketch.Options = SaveAsSketch.Options.DEFAULT
+    ): Promise<boolean> {
         const sketch = await this.sketchServiceClient.currentSketch();
         if (!sketch) {
             return false;
@@ -44,13 +56,29 @@ export class SaveAsSketch extends SketchContribution {
 
         // If target does not exist, propose a `directories.user`/${sketch.name} path
         // If target exists, propose `directories.user`/${sketch.name}_copy_${yyyymmddHHMMss}
-        const sketchDirUri = new URI((await this.configService.getConfiguration()).sketchDirUri);
-        const exists = await this.fileService.exists(sketchDirUri.resolve(sketch.name));
+        const sketchDirUri = new URI(
+            (await this.configService.getConfiguration()).sketchDirUri
+        );
+        const exists = await this.fileService.exists(
+            sketchDirUri.resolve(sketch.name)
+        );
         const defaultUri = exists
-            ? sketchDirUri.resolve(sketchDirUri.resolve(`${sketch.name}_copy_${dateFormat(new Date(), 'yyyymmddHHMMss')}`).toString())
+            ? sketchDirUri.resolve(
+                  sketchDirUri
+                      .resolve(
+                          `${sketch.name}_copy_${dateFormat(
+                              new Date(),
+                              'yyyymmddHHMMss'
+                          )}`
+                      )
+                      .toString()
+              )
             : sketchDirUri.resolve(sketch.name);
         const defaultPath = await this.fileService.fsPath(defaultUri);
-        const { filePath, canceled } = await remote.dialog.showSaveDialog({ title: 'Save sketch folder as...', defaultPath });
+        const { filePath, canceled } = await remote.dialog.showSaveDialog({
+            title: 'Save sketch folder as...',
+            defaultPath,
+        });
         if (!filePath || canceled) {
             return false;
         }
@@ -58,22 +86,31 @@ export class SaveAsSketch extends SketchContribution {
         if (!destinationUri) {
             return false;
         }
-        const workspaceUri = await this.sketchService.copy(sketch, { destinationUri });
+        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)) {
+                try {
+                    await this.fileService.delete(new URI(sketch.uri), {
+                        recursive: true,
+                    });
+                } catch {
+                    /* NOOP: from time to time, it's not possible to wipe the old resource from the temp dir on Windows */
+                }
             }
-            this.workspaceService.open(new URI(workspaceUri), { preserveWindow: true });
+            this.workspaceService.open(new URI(workspaceUri), {
+                preserveWindow: true,
+            });
         }
         return !!workspaceUri;
     }
-
 }
 
 export namespace SaveAsSketch {
     export namespace Commands {
         export const SAVE_AS_SKETCH: Command = {
-            id: 'arduino-save-as-sketch'
+            id: 'arduino-save-as-sketch',
         };
     }
     export interface Options {
@@ -88,7 +125,7 @@ export namespace SaveAsSketch {
         export const DEFAULT: Options = {
             execOnlyIfTemp: false,
             openAfterMove: true,
-            wipeOriginal: false
+            wipeOriginal: false,
         };
     }
 }

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

@@ -2,18 +2,26 @@ import { injectable } from 'inversify';
 import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
-import { SketchContribution, Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, TabBarToolbarRegistry } from './contribution';
+import {
+    SketchContribution,
+    Command,
+    CommandRegistry,
+    MenuModelRegistry,
+    KeybindingRegistry,
+    TabBarToolbarRegistry,
+} from './contribution';
 
 @injectable()
 export class SaveSketch extends SketchContribution {
-
     registerCommands(registry: CommandRegistry): void {
         registry.registerCommand(SaveSketch.Commands.SAVE_SKETCH, {
-            execute: () => this.saveSketch()
+            execute: () => this.saveSketch(),
         });
         registry.registerCommand(SaveSketch.Commands.SAVE_SKETCH__TOOLBAR, {
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
-            execute: () => registry.executeCommand(SaveSketch.Commands.SAVE_SKETCH.id)
+            isVisible: (widget) =>
+                ArduinoToolbar.is(widget) && widget.side === 'left',
+            execute: () =>
+                registry.executeCommand(SaveSketch.Commands.SAVE_SKETCH.id),
         });
     }
 
@@ -21,14 +29,14 @@ export class SaveSketch extends SketchContribution {
         registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
             commandId: SaveSketch.Commands.SAVE_SKETCH.id,
             label: 'Save',
-            order: '6'
+            order: '6',
         });
     }
 
     registerKeybindings(registry: KeybindingRegistry): void {
         registry.registerKeybinding({
             command: SaveSketch.Commands.SAVE_SKETCH.id,
-            keybinding: 'CtrlCmd+S'
+            keybinding: 'CtrlCmd+S',
         });
     }
 
@@ -37,23 +45,22 @@ export class SaveSketch extends SketchContribution {
             id: SaveSketch.Commands.SAVE_SKETCH__TOOLBAR.id,
             command: SaveSketch.Commands.SAVE_SKETCH__TOOLBAR.id,
             tooltip: 'Save',
-            priority: 5
+            priority: 5,
         });
     }
 
     async saveSketch(): Promise<void> {
         return this.commandService.executeCommand(CommonCommands.SAVE_ALL.id);
     }
-
 }
 
 export namespace SaveSketch {
     export namespace Commands {
         export const SAVE_SKETCH: Command = {
-            id: 'arduino-save-sketch'
+            id: 'arduino-save-sketch',
         };
         export const SAVE_SKETCH__TOOLBAR: Command = {
-            id: 'arduino-save-sketch--toolbar'
+            id: 'arduino-save-sketch--toolbar',
         };
     }
 }

arduino-ide-extension/src/browser/contributions/settings.ts

@@ -1,38 +1,68 @@
-import { injectable } from 'inversify';
-import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribution';
-import { URI, Command, MenuModelRegistry, CommandRegistry, SketchContribution, open } from './contribution';
+import { inject, injectable } from 'inversify';
+import {
+    Command,
+    MenuModelRegistry,
+    CommandRegistry,
+    SketchContribution,
+    KeybindingRegistry,
+} from './contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
+import { Settings as Preferences, SettingsDialog } from '../settings';
 
 @injectable()
 export class Settings extends SketchContribution {
+    @inject(SettingsDialog)
+    protected readonly settingsDialog: SettingsDialog;
+
+    protected settingsOpened = false;
 
     registerCommands(registry: CommandRegistry): void {
-        registry.registerCommand(Settings.Commands.OPEN_CLI_CONFIG, {
-            execute: () => this.configService.getCliConfigFileUri().then(uri => open(this.openerService, new URI(uri)))
+        registry.registerCommand(Settings.Commands.OPEN, {
+            execute: async () => {
+                let settings: Preferences | undefined = undefined;
+                try {
+                    this.settingsOpened = true;
+                    settings = await this.settingsDialog.open();
+                } finally {
+                    this.settingsOpened = false;
+                }
+                if (settings) {
+                    await this.settingsService.update(settings);
+                    await this.settingsService.save();
+                } else {
+                    await this.settingsService.reset();
+                }
+            },
+            isEnabled: () => !this.settingsOpened,
         });
     }
 
     registerMenus(registry: MenuModelRegistry): void {
-        registry.registerMenuAction(ArduinoMenus.FILE__SETTINGS_GROUP, {
-            commandId: CommonCommands.OPEN_PREFERENCES.id,
+        registry.registerMenuAction(ArduinoMenus.FILE__PREFERENCES_GROUP, {
+            commandId: Settings.Commands.OPEN.id,
             label: 'Preferences...',
-            order: '0'
-        });
-        registry.registerMenuAction(ArduinoMenus.FILE__SETTINGS_GROUP, {
-            commandId: Settings.Commands.OPEN_CLI_CONFIG.id,
-            label: 'Open CLI Configuration',
-            order: '1',
+            order: '0',
         });
+        registry.registerSubmenu(
+            ArduinoMenus.FILE__ADVANCED_SUBMENU,
+            'Advanced'
+        );
     }
 
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybinding({
+            command: Settings.Commands.OPEN.id,
+            keybinding: 'CtrlCmd+,',
+        });
+    }
 }
 
 export namespace Settings {
     export namespace Commands {
-        export const OPEN_CLI_CONFIG: Command = {
-            id: 'arduino-open-cli-config',
-            label: 'Open CLI Configuration',
-            category: 'Arduino'
-        }
+        export const OPEN: Command = {
+            id: 'arduino-settings-open',
+            label: 'Open Preferences...',
+            category: 'Arduino',
+        };
     }
 }

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

@@ -3,13 +3,27 @@ import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribu
 import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
 import { WorkspaceCommands } from '@theia/workspace/lib/browser';
 import { ContextMenuRenderer } from '@theia/core/lib/browser/context-menu-renderer';
-import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
-import { URI, SketchContribution, Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, TabBarToolbarRegistry, open } from './contribution';
-import { ArduinoMenus } from '../menu/arduino-menus';
+import {
+    Disposable,
+    DisposableCollection,
+} from '@theia/core/lib/common/disposable';
+import {
+    URI,
+    SketchContribution,
+    Command,
+    CommandRegistry,
+    MenuModelRegistry,
+    KeybindingRegistry,
+    TabBarToolbarRegistry,
+    open,
+} from './contribution';
+import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
+import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
+import { SketchesServiceClientImpl } from '../../common/protocol/sketches-service-client-impl';
+import { LocalCacheFsProvider } from '../local-cache/local-cache-fs-provider';
 
 @injectable()
 export class SketchControl extends SketchContribution {
-
     @inject(ApplicationShell)
     protected readonly shell: ApplicationShell;
 
@@ -19,111 +33,251 @@ export class SketchControl extends SketchContribution {
     @inject(ContextMenuRenderer)
     protected readonly contextMenuRenderer: ContextMenuRenderer;
 
-    protected readonly toDisposeBeforeCreateNewContextMenu = new DisposableCollection();
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
+
+    @inject(SketchesServiceClientImpl)
+    protected readonly sketchesServiceClient: SketchesServiceClientImpl;
+
+    @inject(LocalCacheFsProvider)
+    protected readonly localCacheFsProvider: LocalCacheFsProvider;
+
+    protected readonly toDisposeBeforeCreateNewContextMenu =
+        new DisposableCollection();
 
     registerCommands(registry: CommandRegistry): void {
-        registry.registerCommand(SketchControl.Commands.OPEN_SKETCH_CONTROL__TOOLBAR, {
-            isVisible: widget => this.shell.getWidgets('main').indexOf(widget) !== -1,
-            execute: async () => {
-                this.toDisposeBeforeCreateNewContextMenu.dispose();
-                const sketch = await this.sketchServiceClient.currentSketch();
-                if (!sketch) {
-                    return;
-                }
-
-                const target = document.getElementById(SketchControl.Commands.OPEN_SKETCH_CONTROL__TOOLBAR.id);
-                if (!(target instanceof HTMLElement)) {
-                    return;
-                }
-                const { parentElement } = target;
-                if (!parentElement) {
-                    return;
-                }
-
-                const { mainFileUri, otherSketchFileUris, additionalFileUris } = await this.sketchService.loadSketch(sketch.uri);
-                const uris = [mainFileUri, ...otherSketchFileUris, ...additionalFileUris];
-                for (let i = 0; i < uris.length; i++) {
-                    const uri = new URI(uris[i]);
-                    const command = { id: `arduino-focus-file--${uri.toString()}` };
-                    const handler = { execute: () => open(this.openerService, uri) };
-                    this.toDisposeBeforeCreateNewContextMenu.push(registry.registerCommand(command, handler));
-                    this.menuRegistry.registerMenuAction(ArduinoMenus.SKETCH_CONTROL__CONTEXT__RESOURCES_GROUP, {
-                        commandId: command.id,
-                        label: this.labelProvider.getName(uri),
-                        order: `${i}`
-                    });
-                    this.toDisposeBeforeCreateNewContextMenu.push(Disposable.create(() => this.menuRegistry.unregisterMenuAction(command)));
-                }
-                const options = {
-                    menuPath: ArduinoMenus.SKETCH_CONTROL__CONTEXT,
-                    anchor: {
-                        x: parentElement.getBoundingClientRect().left,
-                        y: parentElement.getBoundingClientRect().top + parentElement.offsetHeight
+        registry.registerCommand(
+            SketchControl.Commands.OPEN_SKETCH_CONTROL__TOOLBAR,
+            {
+                isVisible: (widget) =>
+                    this.shell.getWidgets('main').indexOf(widget) !== -1,
+                execute: async () => {
+                    this.toDisposeBeforeCreateNewContextMenu.dispose();
+                    const sketch =
+                        await this.sketchServiceClient.currentSketch();
+                    if (!sketch) {
+                        return;
                     }
-                }
-                this.contextMenuRenderer.render(options);
+
+                    const target = document.getElementById(
+                        SketchControl.Commands.OPEN_SKETCH_CONTROL__TOOLBAR.id
+                    );
+                    if (!(target instanceof HTMLElement)) {
+                        return;
+                    }
+                    const { parentElement } = target;
+                    if (!parentElement) {
+                        return;
+                    }
+
+                    const { mainFileUri, rootFolderFileUris } =
+                        await this.sketchService.loadSketch(sketch.uri);
+                    const uris = [mainFileUri, ...rootFolderFileUris];
+
+                    const currentSketch =
+                        await this.sketchesServiceClient.currentSketch();
+                    const parentsketchUri = this.editorManager.currentEditor
+                        ?.getResourceUri()
+                        ?.toString();
+                    const parentsketch =
+                        await this.sketchService.getSketchFolder(
+                            parentsketchUri || ''
+                        );
+
+                    // if the current file is in the current opened sketch, show extra menus
+                    if (
+                        currentSketch &&
+                        parentsketch &&
+                        parentsketch.uri === currentSketch.uri &&
+                        (await this.allowRename(parentsketch.uri))
+                    ) {
+                        this.menuRegistry.registerMenuAction(
+                            ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
+                            {
+                                commandId: WorkspaceCommands.FILE_RENAME.id,
+                                label: 'Rename',
+                                order: '1',
+                            }
+                        );
+                        this.toDisposeBeforeCreateNewContextMenu.push(
+                            Disposable.create(() =>
+                                this.menuRegistry.unregisterMenuAction(
+                                    WorkspaceCommands.FILE_RENAME
+                                )
+                            )
+                        );
+                    } else {
+                        const renamePlaceholder = new PlaceholderMenuNode(
+                            ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
+                            'Rename'
+                        );
+                        this.menuRegistry.registerMenuNode(
+                            ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
+                            renamePlaceholder
+                        );
+                        this.toDisposeBeforeCreateNewContextMenu.push(
+                            Disposable.create(() =>
+                                this.menuRegistry.unregisterMenuNode(
+                                    renamePlaceholder.id
+                                )
+                            )
+                        );
+                    }
+
+                    if (
+                        currentSketch &&
+                        parentsketch &&
+                        parentsketch.uri === currentSketch.uri &&
+                        (await this.allowDelete(parentsketch.uri))
+                    ) {
+                        this.menuRegistry.registerMenuAction(
+                            ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
+                            {
+                                commandId: WorkspaceCommands.FILE_DELETE.id, // TODO: customize delete. Wipe sketch if deleting main file. Close window.
+                                label: 'Delete',
+                                order: '2',
+                            }
+                        );
+                        this.toDisposeBeforeCreateNewContextMenu.push(
+                            Disposable.create(() =>
+                                this.menuRegistry.unregisterMenuAction(
+                                    WorkspaceCommands.FILE_DELETE
+                                )
+                            )
+                        );
+                    } else {
+                        const deletePlaceholder = new PlaceholderMenuNode(
+                            ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
+                            'Delete'
+                        );
+                        this.menuRegistry.registerMenuNode(
+                            ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
+                            deletePlaceholder
+                        );
+                        this.toDisposeBeforeCreateNewContextMenu.push(
+                            Disposable.create(() =>
+                                this.menuRegistry.unregisterMenuNode(
+                                    deletePlaceholder.id
+                                )
+                            )
+                        );
+                    }
+
+                    for (let i = 0; i < uris.length; i++) {
+                        const uri = new URI(uris[i]);
+
+                        // focus on the opened sketch
+                        const command = {
+                            id: `arduino-focus-file--${uri.toString()}`,
+                        };
+                        const handler = {
+                            execute: () => open(this.openerService, uri),
+                        };
+                        this.toDisposeBeforeCreateNewContextMenu.push(
+                            registry.registerCommand(command, handler)
+                        );
+                        this.menuRegistry.registerMenuAction(
+                            ArduinoMenus.SKETCH_CONTROL__CONTEXT__RESOURCES_GROUP,
+                            {
+                                commandId: command.id,
+                                label: this.labelProvider.getName(uri),
+                                order: `${i}`,
+                            }
+                        );
+                        this.toDisposeBeforeCreateNewContextMenu.push(
+                            Disposable.create(() =>
+                                this.menuRegistry.unregisterMenuAction(command)
+                            )
+                        );
+                    }
+                    const options = {
+                        menuPath: ArduinoMenus.SKETCH_CONTROL__CONTEXT,
+                        anchor: {
+                            x: parentElement.getBoundingClientRect().left,
+                            y:
+                                parentElement.getBoundingClientRect().top +
+                                parentElement.offsetHeight,
+                        },
+                    };
+                    this.contextMenuRenderer.render(options);
+                },
             }
-        });
+        );
     }
 
     registerMenus(registry: MenuModelRegistry): void {
-        registry.registerMenuAction(ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP, {
-            commandId: WorkspaceCommands.NEW_FILE.id,
-            label: 'New Tab',
-            order: '0'
-        });
-        registry.registerMenuAction(ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP, {
-            commandId: WorkspaceCommands.FILE_RENAME.id,
-            label: 'Rename',
-            order: '1'
-        });
-        registry.registerMenuAction(ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP, {
-            commandId: WorkspaceCommands.FILE_DELETE.id, // TODO: customize delete. Wipe sketch if deleting main file. Close window.
-            label: 'Delete',
-            order: '2'
-        });
+        registry.registerMenuAction(
+            ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
+            {
+                commandId: WorkspaceCommands.NEW_FILE.id,
+                label: 'New Tab',
+                order: '0',
+            }
+        );
 
-        registry.registerMenuAction(ArduinoMenus.SKETCH_CONTROL__CONTEXT__NAVIGATION_GROUP, {
-            commandId: CommonCommands.PREVIOUS_TAB.id,
-            label: 'Previous Tab',
-            order: '0'
-        });
-        registry.registerMenuAction(ArduinoMenus.SKETCH_CONTROL__CONTEXT__NAVIGATION_GROUP, {
-            commandId: CommonCommands.NEXT_TAB.id,
-            label: 'Next Tab',
-            order: '0'
-        });
+        registry.registerMenuAction(
+            ArduinoMenus.SKETCH_CONTROL__CONTEXT__NAVIGATION_GROUP,
+            {
+                commandId: CommonCommands.PREVIOUS_TAB.id,
+                label: 'Previous Tab',
+                order: '0',
+            }
+        );
+        registry.registerMenuAction(
+            ArduinoMenus.SKETCH_CONTROL__CONTEXT__NAVIGATION_GROUP,
+            {
+                commandId: CommonCommands.NEXT_TAB.id,
+                label: 'Next Tab',
+                order: '0',
+            }
+        );
     }
 
     registerKeybindings(registry: KeybindingRegistry): void {
         registry.registerKeybinding({
             command: WorkspaceCommands.NEW_FILE.id,
-            keybinding: 'CtrlCmd+Shift+N'
+            keybinding: 'CtrlCmd+Shift+N',
         });
         registry.registerKeybinding({
             command: CommonCommands.PREVIOUS_TAB.id,
-            keybinding: 'CtrlCmd+Alt+Left' // TODO: check why electron does not show the keybindings in the UI.
+            keybinding: 'CtrlCmd+Alt+Left', // TODO: check why electron does not show the keybindings in the UI.
         });
         registry.registerKeybinding({
             command: CommonCommands.NEXT_TAB.id,
-            keybinding: 'CtrlCmd+Alt+Right'
+            keybinding: 'CtrlCmd+Alt+Right',
         });
     }
 
     registerToolbarItems(registry: TabBarToolbarRegistry): void {
         registry.registerItem({
             id: SketchControl.Commands.OPEN_SKETCH_CONTROL__TOOLBAR.id,
-            command: SketchControl.Commands.OPEN_SKETCH_CONTROL__TOOLBAR.id
+            command: SketchControl.Commands.OPEN_SKETCH_CONTROL__TOOLBAR.id,
         });
     }
 
+    protected async isCloudSketch(uri: string) {
+        const cloudCacheLocation = this.localCacheFsProvider.from(new URI(uri));
+
+        if (cloudCacheLocation) {
+            return true;
+        }
+        return false;
+    }
+
+    protected async allowRename(uri: string) {
+        return !this.isCloudSketch(uri);
+    }
+
+    protected async allowDelete(uri: string) {
+        return !this.isCloudSketch(uri);
+    }
 }
 
 export namespace SketchControl {
     export namespace Commands {
         export const OPEN_SKETCH_CONTROL__TOOLBAR: Command = {
             id: 'arduino-open-sketch-control--toolbar',
-            iconClass: 'fa fa-caret-down'
+            iconClass: 'fa fa-caret-down',
         };
     }
 }

arduino-ide-extension/src/browser/contributions/sketchbook.ts

@@ -0,0 +1,66 @@
+import { inject, injectable } from 'inversify';
+import { CommandHandler } from '@theia/core/lib/common/command';
+import { CommandRegistry, MenuModelRegistry } from './contribution';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import { MainMenuManager } from '../../common/main-menu-manager';
+import { NotificationCenter } from '../notification-center';
+import { Examples } from './examples';
+import { SketchContainer } from '../../common/protocol';
+import { OpenSketch } from './open-sketch';
+
+@injectable()
+export class Sketchbook extends Examples {
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
+
+    @inject(MenuModelRegistry)
+    protected readonly menuRegistry: MenuModelRegistry;
+
+    @inject(MainMenuManager)
+    protected readonly mainMenuManager: MainMenuManager;
+
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
+
+    onStart(): void {
+        this.sketchService.getSketches({}).then((container) => {
+            this.register(container);
+            this.mainMenuManager.update();
+        });
+        this.sketchServiceClient.onSketchbookDidChange(() => {
+            this.sketchService.getSketches({}).then((container) => {
+                this.register(container);
+                this.mainMenuManager.update();
+            });
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerSubmenu(
+            ArduinoMenus.FILE__SKETCHBOOK_SUBMENU,
+            'Sketchbook',
+            { order: '3' }
+        );
+    }
+
+    protected register(container: SketchContainer): void {
+        this.toDispose.dispose();
+        this.registerRecursively(
+            [...container.children, ...container.sketches],
+            ArduinoMenus.FILE__SKETCHBOOK_SUBMENU,
+            this.toDispose
+        );
+    }
+
+    protected createHandler(uri: string): CommandHandler {
+        return {
+            execute: async () => {
+                const sketch = await this.sketchService.loadSketch(uri);
+                return this.commandService.executeCommand(
+                    OpenSketch.Commands.OPEN_SKETCH.id,
+                    sketch
+                );
+            },
+        };
+    }
+}

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

@@ -1,16 +1,22 @@
 import { inject, injectable } from 'inversify';
-import { OutputChannelManager } from '@theia/output/lib/common/output-channel';
+import { Emitter } from '@theia/core/lib/common/event';
 import { CoreService } from '../../common/protocol';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import { BoardsDataStore } from '../boards/boards-data-store';
 import { MonitorConnection } from '../monitor/monitor-connection';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import { SketchContribution, Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, TabBarToolbarRegistry } from './contribution';
+import {
+    SketchContribution,
+    Command,
+    CommandRegistry,
+    MenuModelRegistry,
+    KeybindingRegistry,
+    TabBarToolbarRegistry,
+} from './contribution';
 
 @injectable()
 export class UploadSketch extends SketchContribution {
-
     @inject(CoreService)
     protected readonly coreService: CoreService;
 
@@ -23,19 +29,30 @@ export class UploadSketch extends SketchContribution {
     @inject(BoardsServiceProvider)
     protected readonly boardsServiceClientImpl: BoardsServiceProvider;
 
-    @inject(OutputChannelManager)
-    protected readonly outputChannelManager: OutputChannelManager;
+    protected readonly onDidChangeEmitter = new Emitter<Readonly<void>>();
+    readonly onDidChange = this.onDidChangeEmitter.event;
+
+    protected uploadInProgress = false;
 
     registerCommands(registry: CommandRegistry): void {
         registry.registerCommand(UploadSketch.Commands.UPLOAD_SKETCH, {
-            execute: () => this.uploadSketch()
-        });
-        registry.registerCommand(UploadSketch.Commands.UPLOAD_SKETCH_USING_PROGRAMMER, {
-            execute: () => this.uploadSketch(true)
+            execute: () => this.uploadSketch(),
+            isEnabled: () => !this.uploadInProgress,
         });
+        registry.registerCommand(
+            UploadSketch.Commands.UPLOAD_SKETCH_USING_PROGRAMMER,
+            {
+                execute: () => this.uploadSketch(true),
+                isEnabled: () => !this.uploadInProgress,
+            }
+        );
         registry.registerCommand(UploadSketch.Commands.UPLOAD_SKETCH_TOOLBAR, {
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
-            execute: () => registry.executeCommand(UploadSketch.Commands.UPLOAD_SKETCH.id)
+            isVisible: (widget) =>
+                ArduinoToolbar.is(widget) && widget.side === 'left',
+            isEnabled: () => !this.uploadInProgress,
+            isToggled: () => this.uploadInProgress,
+            execute: () =>
+                registry.executeCommand(UploadSketch.Commands.UPLOAD_SKETCH.id),
         });
     }
 
@@ -43,23 +60,23 @@ export class UploadSketch extends SketchContribution {
         registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
             commandId: UploadSketch.Commands.UPLOAD_SKETCH.id,
             label: 'Upload',
-            order: '0'
+            order: '1',
         });
         registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
             commandId: UploadSketch.Commands.UPLOAD_SKETCH_USING_PROGRAMMER.id,
             label: 'Upload Using Programmer',
-            order: '1'
+            order: '2',
         });
     }
 
     registerKeybindings(registry: KeybindingRegistry): void {
         registry.registerKeybinding({
             command: UploadSketch.Commands.UPLOAD_SKETCH.id,
-            keybinding: 'CtrlCmd+U'
+            keybinding: 'CtrlCmd+U',
         });
         registry.registerKeybinding({
             command: UploadSketch.Commands.UPLOAD_SKETCH_USING_PROGRAMMER.id,
-            keybinding: 'CtrlCmd+Shift+U'
+            keybinding: 'CtrlCmd+Shift+U',
         });
     }
 
@@ -68,13 +85,23 @@ export class UploadSketch extends SketchContribution {
             id: UploadSketch.Commands.UPLOAD_SKETCH_TOOLBAR.id,
             command: UploadSketch.Commands.UPLOAD_SKETCH_TOOLBAR.id,
             tooltip: 'Upload',
-            priority: 1
+            priority: 1,
+            onDidChange: this.onDidChange,
         });
     }
 
-    async uploadSketch(usingProgrammer: boolean = false): Promise<void> {
-        const uri = await this.sketchServiceClient.currentSketchFile();
-        if (!uri) {
+    async uploadSketch(usingProgrammer = false): Promise<void> {
+        // even with buttons disabled, better to double check if an upload is already in progress
+        if (this.uploadInProgress) {
+            return;
+        }
+
+        // toggle the toolbar button and menu item state.
+        // uploadInProgress will be set to false whether the upload fails or not
+        this.uploadInProgress = true;
+        this.onDidChangeEmitter.fire();
+        const sketch = await this.sketchServiceClient.currentSketch();
+        if (!sketch) {
             return;
         }
         let shouldAutoConnect = false;
@@ -88,13 +115,24 @@ export class UploadSketch extends SketchContribution {
         }
         try {
             const { boardsConfig } = this.boardsServiceClientImpl;
-            const [fqbn, { selectedProgrammer }] = await Promise.all([
-                this.boardsDataStore.appendConfigToFqbn(boardsConfig.selectedBoard?.fqbn),
-                this.boardsDataStore.getData(boardsConfig.selectedBoard?.fqbn)
+            const [
+                fqbn,
+                { selectedProgrammer },
+                verify,
+                verbose,
+                sourceOverride,
+            ] = await Promise.all([
+                this.boardsDataStore.appendConfigToFqbn(
+                    boardsConfig.selectedBoard?.fqbn
+                ),
+                this.boardsDataStore.getData(boardsConfig.selectedBoard?.fqbn),
+                this.preferences.get('arduino.upload.verify'),
+                this.preferences.get('arduino.upload.verbose'),
+                this.sourceOverride(),
             ]);
 
             let options: CoreService.Upload.Options | undefined = undefined;
-            const sketchUri = uri;
+            const sketchUri = sketch.uri;
             const optimizeForDebug = this.editorMode.compileForDebug;
             const { selectedPort } = boardsConfig;
             const port = selectedPort?.address;
@@ -106,30 +144,42 @@ export class UploadSketch extends SketchContribution {
                     fqbn,
                     optimizeForDebug,
                     programmer,
-                    port
+                    port,
+                    verbose,
+                    verify,
+                    sourceOverride,
                 };
             } else {
                 options = {
                     sketchUri,
                     fqbn,
                     optimizeForDebug,
-                    port
+                    port,
+                    verbose,
+                    verify,
+                    sourceOverride,
                 };
             }
-            this.outputChannelManager.getChannel('Arduino: upload').clear();
+            this.outputChannelManager.getChannel('Arduino').clear();
             if (usingProgrammer) {
                 await this.coreService.uploadUsingProgrammer(options);
             } else {
                 await this.coreService.upload(options);
             }
-            this.messageService.info('Done uploading.', { timeout: 1000 });
+            this.messageService.info('Done uploading.', { timeout: 3000 });
         } catch (e) {
             this.messageService.error(e.toString());
         } finally {
+            this.uploadInProgress = false;
+            this.onDidChangeEmitter.fire();
+
             if (monitorConfig) {
                 const { board, port } = monitorConfig;
                 try {
-                    await this.boardsServiceClientImpl.waitUntilAvailable(Object.assign(board, { port }), 10_000);
+                    await this.boardsServiceClientImpl.waitUntilAvailable(
+                        Object.assign(board, { port }),
+                        10_000
+                    );
                     if (shouldAutoConnect) {
                         // Enabling auto-connect will trigger a connect.
                         this.monitorConnection.autoConnect = true;
@@ -137,24 +187,25 @@ export class UploadSketch extends SketchContribution {
                         await this.monitorConnection.connect(monitorConfig);
                     }
                 } catch (waitError) {
-                    this.messageService.error(`Could not reconnect to serial monitor. ${waitError.toString()}`);
+                    this.messageService.error(
+                        `Could not reconnect to serial monitor. ${waitError.toString()}`
+                    );
                 }
             }
         }
     }
-
 }
 
 export namespace UploadSketch {
     export namespace Commands {
         export const UPLOAD_SKETCH: Command = {
-            id: 'arduino-upload-sketch'
+            id: 'arduino-upload-sketch',
         };
         export const UPLOAD_SKETCH_USING_PROGRAMMER: Command = {
-            id: 'arduino-upload-sketch-using-programmer'
+            id: 'arduino-upload-sketch-using-programmer',
         };
         export const UPLOAD_SKETCH_TOOLBAR: Command = {
-            id: 'arduino-upload-sketch--toolbar'
+            id: 'arduino-upload-sketch--toolbar',
         };
     }
 }

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

@@ -1,15 +1,21 @@
 import { inject, injectable } from 'inversify';
-import { OutputChannelManager } from '@theia/output/lib/common/output-channel';
+import { Emitter } from '@theia/core/lib/common/event';
 import { CoreService } from '../../common/protocol';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import { BoardsDataStore } from '../boards/boards-data-store';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import { SketchContribution, Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, TabBarToolbarRegistry } from './contribution';
+import {
+    SketchContribution,
+    Command,
+    CommandRegistry,
+    MenuModelRegistry,
+    KeybindingRegistry,
+    TabBarToolbarRegistry,
+} from './contribution';
 
 @injectable()
 export class VerifySketch extends SketchContribution {
-
     @inject(CoreService)
     protected readonly coreService: CoreService;
 
@@ -19,16 +25,27 @@ export class VerifySketch extends SketchContribution {
     @inject(BoardsServiceProvider)
     protected readonly boardsServiceClientImpl: BoardsServiceProvider;
 
-    @inject(OutputChannelManager)
-    protected readonly outputChannelManager: OutputChannelManager;
+    protected readonly onDidChangeEmitter = new Emitter<Readonly<void>>();
+    readonly onDidChange = this.onDidChangeEmitter.event;
+
+    protected verifyInProgress = false;
 
     registerCommands(registry: CommandRegistry): void {
         registry.registerCommand(VerifySketch.Commands.VERIFY_SKETCH, {
-            execute: () => this.verifySketch()
+            execute: () => this.verifySketch(),
+            isEnabled: () => !this.verifyInProgress,
+        });
+        registry.registerCommand(VerifySketch.Commands.EXPORT_BINARIES, {
+            execute: () => this.verifySketch(true),
+            isEnabled: () => !this.verifyInProgress,
         });
         registry.registerCommand(VerifySketch.Commands.VERIFY_SKETCH_TOOLBAR, {
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
-            execute: () => registry.executeCommand(VerifySketch.Commands.VERIFY_SKETCH.id)
+            isVisible: (widget) =>
+                ArduinoToolbar.is(widget) && widget.side === 'left',
+            isEnabled: () => !this.verifyInProgress,
+            isToggled: () => this.verifyInProgress,
+            execute: () =>
+                registry.executeCommand(VerifySketch.Commands.VERIFY_SKETCH.id),
         });
     }
 
@@ -36,14 +53,23 @@ export class VerifySketch extends SketchContribution {
         registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
             commandId: VerifySketch.Commands.VERIFY_SKETCH.id,
             label: 'Verify/Compile',
-            order: '2'
+            order: '0',
+        });
+        registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
+            commandId: VerifySketch.Commands.EXPORT_BINARIES.id,
+            label: 'Export compiled Binary',
+            order: '3',
         });
     }
 
     registerKeybindings(registry: KeybindingRegistry): void {
         registry.registerKeybinding({
             command: VerifySketch.Commands.VERIFY_SKETCH.id,
-            keybinding: 'CtrlCmd+R'
+            keybinding: 'CtrlCmd+R',
+        });
+        registry.registerKeybinding({
+            command: VerifySketch.Commands.EXPORT_BINARIES.id,
+            keybinding: 'CtrlCmd+Alt+S',
         });
     }
 
@@ -52,39 +78,68 @@ export class VerifySketch extends SketchContribution {
             id: VerifySketch.Commands.VERIFY_SKETCH_TOOLBAR.id,
             command: VerifySketch.Commands.VERIFY_SKETCH_TOOLBAR.id,
             tooltip: 'Verify',
-            priority: 0
+            priority: 0,
+            onDidChange: this.onDidChange,
         });
     }
 
-    async verifySketch(): Promise<void> {
-        const uri = await this.sketchServiceClient.currentSketchFile();
-        if (!uri) {
+    async verifySketch(exportBinaries?: boolean): Promise<void> {
+        // even with buttons disabled, better to double check if a verify is already in progress
+        if (this.verifyInProgress) {
+            return;
+        }
+
+        // toggle the toolbar button and menu item state.
+        // verifyInProgress will be set to false whether the compilation fails or not
+        this.verifyInProgress = true;
+        this.onDidChangeEmitter.fire();
+        const sketch = await this.sketchServiceClient.currentSketch();
+
+        if (!sketch) {
             return;
         }
         try {
             const { boardsConfig } = this.boardsServiceClientImpl;
-            const fqbn = await this.boardsDataStore.appendConfigToFqbn(boardsConfig.selectedBoard?.fqbn);
-            this.outputChannelManager.getChannel('Arduino: compile').clear();
+            const [fqbn, sourceOverride] = await Promise.all([
+                this.boardsDataStore.appendConfigToFqbn(
+                    boardsConfig.selectedBoard?.fqbn
+                ),
+                this.sourceOverride(),
+            ]);
+            const verbose = this.preferences.get('arduino.compile.verbose');
+            const compilerWarnings = this.preferences.get(
+                'arduino.compile.warnings'
+            );
+            this.outputChannelManager.getChannel('Arduino').clear();
             await this.coreService.compile({
-                sketchUri: uri,
+                sketchUri: sketch.uri,
                 fqbn,
-                optimizeForDebug: this.editorMode.compileForDebug
+                optimizeForDebug: this.editorMode.compileForDebug,
+                verbose,
+                exportBinaries,
+                sourceOverride,
+                compilerWarnings,
             });
-            this.messageService.info('Done compiling.', { timeout: 1000 });
+            this.messageService.info('Done compiling.', { timeout: 3000 });
         } catch (e) {
             this.messageService.error(e.toString());
+        } finally {
+            this.verifyInProgress = false;
+            this.onDidChangeEmitter.fire();
         }
     }
-
 }
 
 export namespace VerifySketch {
     export namespace Commands {
         export const VERIFY_SKETCH: Command = {
-            id: 'arduino-verify-sketch'
+            id: 'arduino-verify-sketch',
+        };
+        export const EXPORT_BINARIES: Command = {
+            id: 'arduino-export-binaries',
         };
         export const VERIFY_SKETCH_TOOLBAR: Command = {
-            id: 'arduino-verify-sketch--toolbar'
+            id: 'arduino-verify-sketch--toolbar',
         };
     }
 }

arduino-ide-extension/src/browser/create/create-api.ts

@@ -0,0 +1,599 @@
+import { injectable } from 'inversify';
+import * as createPaths from './create-paths';
+import { posix, splitSketchPath } from './create-paths';
+import { AuthenticationClientService } from '../auth/authentication-client-service';
+import { ArduinoPreferences } from '../arduino-preferences';
+
+export interface ResponseResultProvider {
+    (response: Response): Promise<any>;
+}
+export namespace ResponseResultProvider {
+    export const NOOP: ResponseResultProvider = async () => undefined;
+    export const TEXT: ResponseResultProvider = (response) => response.text();
+    export const JSON: ResponseResultProvider = (response) => response.json();
+}
+
+type ResourceType = 'f' | 'd';
+
+export let sketchCache: Create.Sketch[] = [];
+
+@injectable()
+export class CreateApi {
+    protected authenticationService: AuthenticationClientService;
+    protected arduinoPreferences: ArduinoPreferences;
+
+    public init(
+        authenticationService: AuthenticationClientService,
+        arduinoPreferences: ArduinoPreferences
+    ): CreateApi {
+        this.authenticationService = authenticationService;
+        this.arduinoPreferences = arduinoPreferences;
+
+        return this;
+    }
+
+    public sketchCompareByPath = (param: string) => {
+        return (sketch: Create.Sketch) => {
+            const [, spath] = splitSketchPath(sketch.path);
+            return param === spath;
+        };
+    };
+
+    async findSketchInCache(
+        compareFn: (sketch: Create.Sketch) => boolean,
+        trustCache = true
+    ): Promise<Create.Sketch | undefined> {
+        const sketch = sketchCache.find((sketch) => compareFn(sketch));
+        if (trustCache) {
+            return Promise.resolve(sketch);
+        }
+        return await this.sketch({ id: sketch?.id });
+    }
+
+    getSketchSecretStat(sketch: Create.Sketch): Create.Resource {
+        return {
+            href: `${sketch.href}${posix.sep}${Create.arduino_secrets_file}`,
+            modified_at: sketch.modified_at,
+            name: `${Create.arduino_secrets_file}`,
+            path: `${sketch.path}${posix.sep}${Create.arduino_secrets_file}`,
+            mimetype: 'text/x-c++src; charset=utf-8',
+            type: 'file',
+            sketchId: sketch.id,
+        };
+    }
+
+    async sketch(opt: {
+        id?: string;
+        path?: string;
+    }): Promise<Create.Sketch | undefined> {
+        let url;
+        if (opt.id) {
+            url = new URL(`${this.domain()}/sketches/byID/${opt.id}`);
+        } else if (opt.path) {
+            url = new URL(`${this.domain()}/sketches/byPath${opt.path}`);
+        } else {
+            return;
+        }
+
+        url.searchParams.set('user_id', 'me');
+        const headers = await this.headers();
+        const result = await this.run<Create.Sketch>(url, {
+            method: 'GET',
+            headers,
+        });
+        return result;
+    }
+
+    async sketches(): Promise<Create.Sketch[]> {
+        const url = new URL(`${this.domain()}/sketches`);
+        url.searchParams.set('user_id', 'me');
+        const headers = await this.headers();
+        const result = await this.run<{ sketches: Create.Sketch[] }>(url, {
+            method: 'GET',
+            headers,
+        });
+        sketchCache = result.sketches;
+        return result.sketches;
+    }
+
+    async createSketch(
+        posixPath: string,
+        content: string = CreateApi.defaultInoContent
+    ): Promise<Create.Sketch> {
+        const url = new URL(`${this.domain()}/sketches`);
+        const headers = await this.headers();
+        const payload = {
+            ino: btoa(content),
+            path: posixPath,
+            user_id: 'me',
+        };
+        const init = {
+            method: 'PUT',
+            body: JSON.stringify(payload),
+            headers,
+        };
+        const result = await this.run<Create.Sketch>(url, init);
+        return result;
+    }
+
+    async readDirectory(
+        posixPath: string,
+        options: { recursive?: boolean; match?: string; secrets?: boolean } = {}
+    ): Promise<Create.Resource[]> {
+        const url = new URL(
+            `${this.domain()}/files/d/$HOME/sketches_v2${posixPath}`
+        );
+        if (options.recursive) {
+            url.searchParams.set('deep', 'true');
+        }
+        if (options.match) {
+            url.searchParams.set('name_like', options.match);
+        }
+        const headers = await this.headers();
+
+        const sketchProm = options.secrets
+            ? this.sketches()
+            : Promise.resolve(sketchCache);
+
+        return Promise.all([
+            this.run<Create.RawResource[]>(url, {
+                method: 'GET',
+                headers,
+            }),
+            sketchProm,
+        ])
+            .then(async ([result, sketches]) => {
+                if (options.secrets) {
+                    // for every sketch with secrets, create a fake arduino_secrets.h
+                    result.forEach(async (res) => {
+                        if (res.type !== 'sketch') {
+                            return;
+                        }
+
+                        const [, spath] = createPaths.splitSketchPath(res.path);
+                        const sketch = await this.findSketchInCache(
+                            this.sketchCompareByPath(spath)
+                        );
+                        if (
+                            sketch &&
+                            sketch.secrets &&
+                            sketch.secrets.length > 0
+                        ) {
+                            result.push(this.getSketchSecretStat(sketch));
+                        }
+                    });
+
+                    if (posixPath !== posix.sep) {
+                        const sketch = await this.findSketchInCache(
+                            this.sketchCompareByPath(posixPath)
+                        );
+                        if (
+                            sketch &&
+                            sketch.secrets &&
+                            sketch.secrets.length > 0
+                        ) {
+                            result.push(this.getSketchSecretStat(sketch));
+                        }
+                    }
+                }
+                const sketchesMap: Record<string, Create.Sketch> =
+                    sketches.reduce((prev, curr) => {
+                        return { ...prev, [curr.path]: curr };
+                    }, {});
+
+                // add the sketch id and isPublic to the resource
+                return result.map((resource) => {
+                    return {
+                        ...resource,
+                        sketchId: sketchesMap[resource.path]?.id || '',
+                        isPublic:
+                            sketchesMap[resource.path]?.is_public || false,
+                    };
+                });
+            })
+            .catch((reason) => {
+                if (reason?.status === 404) return [] as Create.Resource[];
+                else throw reason;
+            });
+    }
+
+    async createDirectory(posixPath: string): Promise<void> {
+        const url = new URL(
+            `${this.domain()}/files/d/$HOME/sketches_v2${posixPath}`
+        );
+        const headers = await this.headers();
+        await this.run(url, {
+            method: 'POST',
+            headers,
+        });
+    }
+
+    async stat(posixPath: string): Promise<Create.Resource> {
+        // The root is a directory read.
+        if (posixPath === '/') {
+            throw new Error('Stating the root is not supported');
+        }
+        // The RESTful API has different endpoints for files and directories.
+        // The RESTful API does not provide specific error codes, only HTP 500.
+        // We query the parent directory and look for the file with the last segment.
+        const parentPosixPath = createPaths.parentPosix(posixPath);
+        const basename = createPaths.basename(posixPath);
+
+        let resources;
+        if (basename === Create.arduino_secrets_file) {
+            const sketch = await this.findSketchInCache(
+                this.sketchCompareByPath(parentPosixPath)
+            );
+            resources = sketch ? [this.getSketchSecretStat(sketch)] : [];
+        } else {
+            resources = await this.readDirectory(parentPosixPath, {
+                match: basename,
+            });
+        }
+
+        resources.sort((left, right) => left.path.length - right.path.length);
+        const resource = resources.find(({ name }) => name === basename);
+        if (!resource) {
+            throw new CreateError(`Not found: ${posixPath}.`, 404);
+        }
+        return resource;
+    }
+
+    private async toggleSecretsInclude(
+        path: string,
+        data: string,
+        mode: 'add' | 'remove'
+    ) {
+        const includeString = `#include "${Create.arduino_secrets_file}"`;
+        const includeRegexp = new RegExp(includeString + '\\s*', 'g');
+
+        const basename = createPaths.basename(path);
+        if (mode === 'add') {
+            const doesIncludeSecrets = includeRegexp.test(data);
+
+            if (doesIncludeSecrets) {
+                return data;
+            }
+
+            const sketch = await this.findSketchInCache((sketch) => {
+                const [, spath] = splitSketchPath(sketch.path);
+                return spath === createPaths.parentPosix(path);
+            }, true);
+
+            if (
+                sketch &&
+                (sketch.name + '.ino' === basename ||
+                    sketch.name + '.pde' === basename) &&
+                sketch.secrets &&
+                sketch.secrets.length > 0
+            ) {
+                return includeString + '\n' + data;
+            }
+        } else if (mode === 'remove') {
+            return data.replace(includeRegexp, '');
+        }
+        return data;
+    }
+
+    async readFile(posixPath: string): Promise<string> {
+        const basename = createPaths.basename(posixPath);
+
+        if (basename === Create.arduino_secrets_file) {
+            const parentPosixPath = createPaths.parentPosix(posixPath);
+            const sketch = await this.findSketchInCache(
+                this.sketchCompareByPath(parentPosixPath),
+                false
+            );
+
+            let file = '';
+            if (sketch && sketch.secrets) {
+                for (const item of sketch?.secrets) {
+                    file += `#define ${item.name} "${item.value}"\r\n`;
+                }
+            }
+            return file;
+        }
+
+        const url = new URL(
+            `${this.domain()}/files/f/$HOME/sketches_v2${posixPath}`
+        );
+        const headers = await this.headers();
+        const result = await this.run<{ data: string; path: string }>(url, {
+            method: 'GET',
+            headers,
+        });
+        let { data } = result;
+
+        // add includes to main arduino file
+        data = await this.toggleSecretsInclude(posixPath, atob(data), 'add');
+        return data;
+    }
+
+    async writeFile(
+        posixPath: string,
+        content: string | Uint8Array
+    ): Promise<void> {
+        const basename = createPaths.basename(posixPath);
+
+        if (basename === Create.arduino_secrets_file) {
+            const parentPosixPath = createPaths.parentPosix(posixPath);
+            const sketch = await this.findSketchInCache(
+                this.sketchCompareByPath(parentPosixPath)
+            );
+            if (sketch) {
+                const url = new URL(`${this.domain()}/sketches/${sketch.id}`);
+                const headers = await this.headers();
+
+                // parse the secret file
+                const secrets = (
+                    typeof content === 'string'
+                        ? content
+                        : new TextDecoder().decode(content)
+                )
+                    .split(/\r?\n/)
+                    .reduce((prev, curr) => {
+                        // check if the line contains a secret
+                        const secret = curr.split('SECRET_')[1] || null;
+                        if (!secret) {
+                            return prev;
+                        }
+                        const regexp = /(\S*)\s+([\S\s]*)/g;
+                        const tokens = regexp.exec(secret) || [];
+                        const name =
+                            tokens[1].length > 0 ? `SECRET_${tokens[1]}` : '';
+
+                        let value = '';
+                        if (tokens[2].length > 0) {
+                            value = JSON.parse(
+                                JSON.stringify(
+                                    tokens[2]
+                                        .replace(/^['"]?/g, '')
+                                        .replace(/['"]?$/g, '')
+                                )
+                            );
+                        }
+
+                        if (name.length === 0) {
+                            return prev;
+                        }
+
+                        return [...prev, { name, value }];
+                    }, []);
+
+                const payload = {
+                    id: sketch.id,
+                    libraries: sketch.libraries,
+                    secrets: { data: secrets },
+                };
+
+                // replace the sketch in the cache, so other calls will not overwrite each other
+                sketchCache = sketchCache.filter((skt) => skt.id !== sketch.id);
+                sketchCache.push({ ...sketch, secrets });
+
+                const init = {
+                    method: 'POST',
+                    body: JSON.stringify(payload),
+                    headers,
+                };
+                await this.run(url, init);
+            }
+            return;
+        }
+
+        const url = new URL(
+            `${this.domain()}/files/f/$HOME/sketches_v2${posixPath}`
+        );
+        const headers = await this.headers();
+
+        let data: string =
+            typeof content === 'string'
+                ? content
+                : new TextDecoder().decode(content);
+        data = await this.toggleSecretsInclude(posixPath, data, 'remove');
+
+        const payload = { data: btoa(data) };
+        const init = {
+            method: 'POST',
+            body: JSON.stringify(payload),
+            headers,
+        };
+        await this.run(url, init);
+    }
+
+    async deleteFile(posixPath: string): Promise<void> {
+        await this.delete(posixPath, 'f');
+    }
+
+    async deleteDirectory(posixPath: string): Promise<void> {
+        await this.delete(posixPath, 'd');
+    }
+
+    private async delete(posixPath: string, type: ResourceType): Promise<void> {
+        const url = new URL(
+            `${this.domain()}/files/${type}/$HOME/sketches_v2${posixPath}`
+        );
+        const headers = await this.headers();
+        await this.run(url, {
+            method: 'DELETE',
+            headers,
+        });
+    }
+
+    async rename(fromPosixPath: string, toPosixPath: string): Promise<void> {
+        const url = new URL(`${this.domain('v3')}/files/mv`);
+        const headers = await this.headers();
+        const payload = {
+            from: `$HOME/sketches_v2${fromPosixPath}`,
+            to: `$HOME/sketches_v2${toPosixPath}`,
+        };
+        const init = {
+            method: 'POST',
+            body: JSON.stringify(payload),
+            headers,
+        };
+        await this.run(url, init, ResponseResultProvider.NOOP);
+    }
+
+    async editSketch({
+        id,
+        params,
+    }: {
+        id: string;
+        params: Record<string, unknown>;
+    }): Promise<Create.Sketch> {
+        const url = new URL(`${this.domain()}/sketches/${id}`);
+
+        const headers = await this.headers();
+        const result = await this.run<Create.Sketch>(url, {
+            method: 'POST',
+            body: JSON.stringify({ id, ...params }),
+            headers,
+        });
+        return result;
+    }
+
+    async copy(fromPosixPath: string, toPosixPath: string): Promise<void> {
+        const payload = {
+            from: `$HOME/sketches_v2${fromPosixPath}`,
+            to: `$HOME/sketches_v2${toPosixPath}`,
+        };
+        const url = new URL(`${this.domain('v3')}/files/cp`);
+        const headers = await this.headers();
+        const init = {
+            method: 'POST',
+            body: JSON.stringify(payload),
+            headers,
+        };
+        await this.run(url, init, ResponseResultProvider.NOOP);
+    }
+
+    private async run<T>(
+        requestInfo: RequestInfo | URL,
+        init: RequestInit | undefined,
+        resultProvider: ResponseResultProvider = ResponseResultProvider.JSON
+    ): Promise<T> {
+        const response = await fetch(
+            requestInfo instanceof URL ? requestInfo.toString() : requestInfo,
+            init
+        );
+        if (!response.ok) {
+            let details: string | undefined = undefined;
+            try {
+                details = await response.json();
+            } catch (e) {
+                console.error('Cloud not get the error details.', e);
+            }
+            const { statusText, status } = response;
+            throw new CreateError(statusText, status, details);
+        }
+        const result = await resultProvider(response);
+        return result;
+    }
+
+    private async headers(): Promise<Record<string, string>> {
+        const token = await this.token();
+        return {
+            'content-type': 'application/json',
+            accept: 'application/json',
+            authorization: `Bearer ${token}`,
+        };
+    }
+
+    private domain(apiVersion = 'v2'): string {
+        const endpoint =
+            this.arduinoPreferences['arduino.cloud.sketchSyncEnpoint'];
+        return `${endpoint}/${apiVersion}`;
+    }
+
+    private async token(): Promise<string> {
+        return this.authenticationService.session?.accessToken || '';
+    }
+}
+
+export namespace CreateApi {
+    export const defaultInoContent = `/*
+
+*/
+
+void setup() {
+  
+}
+
+void loop() {
+  
+}
+
+`;
+}
+
+export namespace Create {
+    export interface Sketch {
+        readonly name: string;
+        readonly path: string;
+        readonly modified_at: string;
+        readonly created_at: string;
+
+        readonly secrets?: { name: string; value: string }[];
+
+        readonly id: string;
+        readonly is_public: boolean;
+        // readonly board_fqbn: '',
+        // readonly board_name: '',
+        // readonly board_type: 'serial' | 'network' | 'cloud' | '',
+        readonly href?: string;
+        readonly libraries: string[];
+        // readonly tutorials: string[] | null;
+        // readonly types: string[] | null;
+        // readonly user_id: string;
+    }
+
+    export type ResourceType = 'sketch' | 'folder' | 'file';
+    export const arduino_secrets_file = 'arduino_secrets.h';
+    export interface Resource {
+        readonly name: string;
+        /**
+         * Note: this path is **not** the POSIX path we use. It has the leading segments with the `user_id`.
+         */
+        readonly path: string;
+        readonly type: ResourceType;
+        readonly sketchId: string;
+        readonly modified_at: string; // As an ISO-8601 formatted string: `YYYY-MM-DDTHH:mm:ss.sssZ`
+        readonly children?: number; // For 'sketch' and 'folder' types.
+        readonly size?: number; // For 'sketch' type only.
+        readonly isPublic?: boolean; // For 'sketch' type only.
+
+        readonly mimetype?: string; // For 'file' type.
+        readonly href?: string;
+    }
+    export namespace Resource {
+        export function is(arg: any): arg is Resource {
+            return (
+                !!arg &&
+                'name' in arg &&
+                typeof arg['name'] === 'string' &&
+                'path' in arg &&
+                typeof arg['path'] === 'string' &&
+                'type' in arg &&
+                typeof arg['type'] === 'string' &&
+                'modified_at' in arg &&
+                typeof arg['modified_at'] === 'string' &&
+                (arg['type'] === 'sketch' ||
+                    arg['type'] === 'folder' ||
+                    arg['type'] === 'file')
+            );
+        }
+    }
+
+    export type RawResource = Omit<Resource, 'sketchId' | 'isPublic'>;
+}
+
+export class CreateError extends Error {
+    constructor(
+        message: string,
+        readonly status: number,
+        readonly details?: string
+    ) {
+        super(message);
+        Object.setPrototypeOf(this, CreateError.prototype);
+    }
+}

arduino-ide-extension/src/browser/create/create-fs-provider.ts

@@ -0,0 +1,208 @@
+import { inject, injectable } from 'inversify';
+import URI from '@theia/core/lib/common/uri';
+import { Event } from '@theia/core/lib/common/event';
+import {
+    Disposable,
+    DisposableCollection,
+} from '@theia/core/lib/common/disposable';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import {
+    Stat,
+    FileType,
+    FileChange,
+    FileWriteOptions,
+    FileDeleteOptions,
+    FileOverwriteOptions,
+    FileSystemProvider,
+    FileSystemProviderError,
+    FileSystemProviderErrorCode,
+    FileSystemProviderCapabilities,
+    WatchOptions,
+} from '@theia/filesystem/lib/common/files';
+import {
+    FileService,
+    FileServiceContribution,
+} from '@theia/filesystem/lib/browser/file-service';
+import { AuthenticationClientService } from '../auth/authentication-client-service';
+import { Create, CreateApi } from './create-api';
+import { CreateUri } from './create-uri';
+import { SketchesService } from '../../common/protocol';
+import { ArduinoPreferences } from '../arduino-preferences';
+
+export const REMOTE_ONLY_FILES = ['sketch.json'];
+
+@injectable()
+export class CreateFsProvider
+    implements
+        FileSystemProvider,
+        FrontendApplicationContribution,
+        FileServiceContribution
+{
+    @inject(AuthenticationClientService)
+    protected readonly authenticationService: AuthenticationClientService;
+
+    @inject(CreateApi)
+    protected readonly createApi: CreateApi;
+
+    @inject(SketchesService)
+    protected readonly sketchesService: SketchesService;
+
+    @inject(ArduinoPreferences)
+    protected readonly arduinoPreferences: ArduinoPreferences;
+
+    protected readonly toDispose = new DisposableCollection();
+
+    readonly onFileWatchError: Event<void> = Event.None;
+    readonly onDidChangeFile: Event<readonly FileChange[]> = Event.None;
+    readonly onDidChangeCapabilities: Event<void> = Event.None;
+    readonly capabilities: FileSystemProviderCapabilities =
+        FileSystemProviderCapabilities.FileReadWrite |
+        FileSystemProviderCapabilities.PathCaseSensitive |
+        FileSystemProviderCapabilities.Access;
+
+    onStop(): void {
+        this.toDispose.dispose();
+    }
+
+    registerFileSystemProviders(service: FileService): void {
+        service.onWillActivateFileSystemProvider((event) => {
+            if (event.scheme === CreateUri.scheme) {
+                event.waitUntil(
+                    (async () => {
+                        service.registerProvider(CreateUri.scheme, this);
+                    })()
+                );
+            }
+        });
+    }
+
+    watch(uri: URI, opts: WatchOptions): Disposable {
+        return Disposable.NULL;
+    }
+
+    async stat(uri: URI): Promise<Stat> {
+        if (CreateUri.equals(CreateUri.root, uri)) {
+            this.getCreateApi; // This will throw when not logged in.
+            return {
+                type: FileType.Directory,
+                ctime: 0,
+                mtime: 0,
+                size: 0,
+            };
+        }
+        const resource = await this.getCreateApi.stat(uri.path.toString());
+        const mtime = Date.parse(resource.modified_at);
+        return {
+            type: this.toFileType(resource.type),
+            ctime: mtime,
+            mtime,
+            size: 0,
+        };
+    }
+
+    async mkdir(uri: URI): Promise<void> {
+        await this.getCreateApi.createDirectory(uri.path.toString());
+    }
+
+    async readdir(uri: URI): Promise<[string, FileType][]> {
+        const resources = await this.getCreateApi.readDirectory(
+            uri.path.toString(),
+            {
+                secrets: true,
+            }
+        );
+        return resources
+            .filter((res) => !REMOTE_ONLY_FILES.includes(res.name))
+            .map(({ name, type }) => [name, this.toFileType(type)]);
+    }
+
+    async delete(uri: URI, opts: FileDeleteOptions): Promise<void> {
+        return;
+
+        if (!opts.recursive) {
+            throw new Error(
+                'Arduino Create file-system provider does not support non-recursive deletion.'
+            );
+        }
+        const stat = await this.stat(uri);
+        if (!stat) {
+            throw new FileSystemProviderError(
+                'File not found.',
+                FileSystemProviderErrorCode.FileNotFound
+            );
+        }
+        switch (stat.type) {
+            case FileType.Directory: {
+                await this.getCreateApi.deleteDirectory(uri.path.toString());
+                break;
+            }
+            case FileType.File: {
+                await this.getCreateApi.deleteFile(uri.path.toString());
+                break;
+            }
+            default: {
+                throw new FileSystemProviderError(
+                    `Unexpected file type '${
+                        stat.type
+                    }' for resource: ${uri.toString()}`,
+                    FileSystemProviderErrorCode.Unknown
+                );
+            }
+        }
+    }
+
+    async rename(
+        oldUri: URI,
+        newUri: URI,
+        options: FileOverwriteOptions
+    ): Promise<void> {
+        await this.getCreateApi.rename(
+            oldUri.path.toString(),
+            newUri.path.toString()
+        );
+    }
+
+    async readFile(uri: URI): Promise<Uint8Array> {
+        const content = await this.getCreateApi.readFile(uri.path.toString());
+        return new TextEncoder().encode(content);
+    }
+
+    async writeFile(
+        uri: URI,
+        content: Uint8Array,
+        options: FileWriteOptions
+    ): Promise<void> {
+        await this.getCreateApi.writeFile(uri.path.toString(), content);
+    }
+
+    async access(uri: URI, mode?: number): Promise<void> {
+        this.getCreateApi; // Will throw if not logged in.
+    }
+
+    public toFileType(type: Create.ResourceType): FileType {
+        switch (type) {
+            case 'file':
+                return FileType.File;
+            case 'sketch':
+            case 'folder':
+                return FileType.Directory;
+            default:
+                return FileType.Unknown;
+        }
+    }
+
+    private get getCreateApi(): CreateApi {
+        const { session } = this.authenticationService;
+        if (!session) {
+            throw new FileSystemProviderError(
+                'Not logged in.',
+                FileSystemProviderErrorCode.NoPermissions
+            );
+        }
+
+        return this.createApi.init(
+            this.authenticationService,
+            this.arduinoPreferences
+        );
+    }
+}

arduino-ide-extension/src/browser/create/create-paths.ts

@@ -0,0 +1,59 @@
+export const posix = { sep: '/' };
+
+// TODO: poor man's `path.join(path, '..')` in the browser.
+export function parentPosix(path: string): string {
+    const segments = path.split(posix.sep) || [];
+    segments.pop();
+    let modified = segments.join(posix.sep);
+    if (path.charAt(path.length - 1) === posix.sep) {
+        modified += posix.sep;
+    }
+    return modified;
+}
+
+export function basename(path: string): string {
+    const segments = path.split(posix.sep) || [];
+    return segments.pop()!;
+}
+
+export function posixSegments(posixPath: string): string[] {
+    return posixPath.split(posix.sep).filter((segment) => !!segment);
+}
+
+/**
+ * Splits the `raw` path into two segments, a root that contains user information and the relevant POSIX path. \
+ * For examples:
+ * ```
+ * `29ad0829759028dde9b877343fa3b0e1:testrest/sketches_v2/xxx_folder/xxx_sub_folder/sketch_in_folder/sketch_in_folder.ino`
+ * ```
+ * will be:
+ * ```
+ * ['29ad0829759028dde9b877343fa3b0e1:testrest/sketches_v2', '/xxx_folder/xxx_sub_folder/sketch_in_folder/sketch_in_folder.ino']
+ * ```
+ */
+export function splitSketchPath(
+    raw: string,
+    sep = '/sketches_v2/'
+): [string, string] {
+    if (!sep) {
+        throw new Error('Invalid separator. Cannot be zero length.');
+    }
+    const index = raw.indexOf(sep);
+    if (index === -1) {
+        throw new Error(`Invalid path pattern. Raw path was '${raw}'.`);
+    }
+    const createRoot = raw.substring(0, index + sep.length - 1); // TODO: validate the `createRoot` format.
+    const posixPath = raw.substr(index + sep.length - 1);
+    if (!posixPath) {
+        throw new Error(`Could not extract POSIX path from '${raw}'.`);
+    }
+    return [createRoot, posixPath];
+}
+
+export function toPosixPath(raw: string): string {
+    if (raw === posix.sep) {
+        return posix.sep; // Handles the root resource case.
+    }
+    const [, posixPath] = splitSketchPath(raw);
+    return posixPath;
+}

arduino-ide-extension/src/browser/create/create-uri.ts

@@ -0,0 +1,39 @@
+import { URI as Uri } from 'vscode-uri';
+import URI from '@theia/core/lib/common/uri';
+import { Create } from './create-api';
+import { toPosixPath, parentPosix, posix } from './create-paths';
+
+export namespace CreateUri {
+    export const scheme = 'arduino-create';
+    export const root = toUri(posix.sep);
+
+    export function toUri(posixPathOrResource: string | Create.Resource): URI {
+        const posixPath =
+            typeof posixPathOrResource === 'string'
+                ? posixPathOrResource
+                : toPosixPath(posixPathOrResource.path);
+        return new URI(
+            Uri.parse(posixPath).with({ scheme, authority: 'create' })
+        );
+    }
+
+    export function is(uri: URI): boolean {
+        return uri.scheme === scheme;
+    }
+
+    export function equals(left: URI, right: URI): boolean {
+        return is(left) && is(right) && left.toString() === right.toString();
+    }
+
+    export function parent(uri: URI): URI {
+        if (!is(uri)) {
+            throw new Error(
+                `Invalid URI scheme. Expected '${scheme}' got '${uri.scheme}' instead.`
+            );
+        }
+        if (equals(uri, root)) {
+            return uri;
+        }
+        return toUri(parentPosix(uri.path.toString()));
+    }
+}

arduino-ide-extension/src/browser/data/arduino.color-theme.json

@@ -28,7 +28,8 @@
       "scope": [
         "meta.function.c",
         "entity.name.function",
-        "meta.function-call.c"
+        "meta.function-call.c",
+        "variable.other"
       ],
       "settings": {
         "foreground": "#D35400"
@@ -42,16 +43,19 @@
         "meta.block.c",
         "meta.function.c",
         "entity.name.function.preprocessor.c",
-        "meta.preprocessor.macro.c"
+        "meta.preprocessor.macro.c",
+        "variable",
+        "variable.name"
       ],
       "settings": {
         "foreground": "#434f54"
       }
     },
     {
-      "name": "strings",
+      "name": "constants",
       "scope": [
-        "string.quoted.double"
+        "string.quoted.double",
+        "constant"
       ],
       "settings": {
         "foreground": "#005C5F"
@@ -80,22 +84,27 @@
     }
   ],
   "colors": {
-    "list.highlightForeground": "#006468",
-    "list.activeSelectionBackground": "#006468",
+    "list.highlightForeground": "#005c5f",
+    "list.activeSelectionForeground": "#424242",
+    "list.activeSelectionBackground": "#DAE3E3",
+    "list.inactiveSelectionForeground": "#424242",
+    "list.inactiveSelectionBackground": "#DAE3E3",
+    "list.hoverBackground": "#ECF1F1",
+    "progressBar.background": "#005c5f",
     "editor.background": "#ffffff",
     "editorCursor.foreground": "#434f54",
     "editor.foreground": "#434f54",
     "editorWhitespace.foreground": "#bfbfbf",
     "editor.lineHighlightBackground": "#434f5410",
     "editor.selectionBackground": "#ffcb00",
-    "focusBorder": "#4db7bb99",
+    "focusBorder": "#7fcbcd99",
     "menubar.selectionBackground": "#ffffff",
     "menubar.selectionForeground": "#212121",
     "menu.selectionBackground": "#dae3e3",
     "menu.selectionForeground": "#212121",
     "editorGroupHeader.tabsBackground": "#f7f9f9",
-    "button.background": "#4db7bb",
-    "titleBar.activeBackground": "#006468",
+    "button.background": "#7fcbcd",
+    "titleBar.activeBackground": "#005c5f",
     "titleBar.activeForeground": "#ffffff",
     "terminal.background": "#000000",
     "terminal.foreground": "#e0e0e0",
@@ -103,8 +112,9 @@
     "dropdown.background": "#ececec",
     "activityBar.background": "#ececec",
     "activityBar.foreground": "#616161",
-    "statusBar.background": "#006468",
+    "statusBar.background": "#005c5f",
     "secondaryButton.background": "#b5c8c9",
+    "secondaryButton.foreground": "#ececec",
     "secondaryButton.hoverBackground": "#dae3e3",
     "arduino.branding.primary": "#00979d",
     "arduino.branding.secondary": "#b5c8c9",

arduino-ide-extension/src/browser/dialogs.ts/cloud-share-sketch-dialog.tsx

@@ -0,0 +1,175 @@
+import * as React from 'react';
+import { inject, injectable } from 'inversify';
+import { Widget } from '@phosphor/widgets';
+import { Message } from '@phosphor/messaging';
+import { clipboard } from 'electron';
+import {
+    AbstractDialog,
+    ReactWidget,
+    DialogProps,
+} from '@theia/core/lib/browser';
+import { CreateApi } from '../create/create-api';
+
+const RadioButton = (props: {
+    id: string;
+    changed: (evt: React.BaseSyntheticEvent) => void;
+    value: string;
+    isSelected: boolean;
+    isDisabled: boolean;
+    label: string;
+}) => {
+    return (
+        <p className="RadioButton">
+            <input
+                id={props.id}
+                onChange={props.changed}
+                value={props.value}
+                type="radio"
+                checked={props.isSelected}
+                disabled={props.isDisabled}
+            />
+            <label htmlFor={props.id}>{props.label}</label>
+        </p>
+    );
+};
+
+export const ShareSketchComponent = ({
+    treeNode,
+    createApi,
+    domain = 'https://create.arduino.cc',
+}: {
+    treeNode: any;
+    createApi: CreateApi;
+    domain?: string;
+}): React.ReactElement => {
+    // const [publicVisibility, setPublicVisibility] = React.useState<boolean>(
+    //     treeNode.isPublic
+    // );
+
+    const [loading, setloading] = React.useState<boolean>(false);
+
+    const radioChangeHandler = async (event: React.BaseSyntheticEvent) => {
+        setloading(true);
+        const sketch = await createApi.editSketch({
+            id: treeNode.sketchId,
+            params: {
+                is_public: event.target.value === 'private' ? false : true,
+            },
+        });
+        // setPublicVisibility(sketch.is_public);
+        treeNode.isPublic = sketch.is_public;
+        setloading(false);
+    };
+
+    const sketchLink = `${domain}/editor/_/${treeNode.sketchId}/preview`;
+    const embedLink = `<iframe src="${sketchLink}?embed" style="height:510px;width:100%;margin:10px 0" frameborder=0></iframe>`;
+
+    return (
+        <div id="widget-container arduino-sharesketch-dialog">
+            <p>Choose visibility of your Sketch:</p>
+            <RadioButton
+                changed={radioChangeHandler}
+                id="1"
+                isSelected={treeNode.isPublic === false}
+                label="Private. Only you can view the Sketch."
+                value="private"
+                isDisabled={loading}
+            />
+            <RadioButton
+                changed={radioChangeHandler}
+                id="2"
+                isSelected={treeNode.isPublic === true}
+                label="Public. Anyone with the link can view the Sketch."
+                value="public"
+                isDisabled={loading}
+            />
+
+            {treeNode.isPublic && (
+                <div>
+                    <p>Link:</p>
+                    <div className="sketch-link">
+                        <input
+                            type="text"
+                            readOnly
+                            value={sketchLink}
+                            className="theia-input"
+                        />
+                        <button
+                            onClick={() => clipboard.writeText(sketchLink)}
+                            value="copy"
+                            className="theia-button secondary"
+                        >
+                            Copy
+                        </button>
+                    </div>
+                    <p>Embed:</p>
+                    <div className="sketch-link-embed">
+                        <textarea
+                            readOnly
+                            value={embedLink}
+                            className="theia-input stretch"
+                        />
+                    </div>
+                </div>
+            )}
+        </div>
+    );
+};
+
+@injectable()
+export class ShareSketchWidget extends ReactWidget {
+    constructor(private treeNode: any, private createApi: CreateApi) {
+        super();
+    }
+
+    protected render(): React.ReactNode {
+        return (
+            <ShareSketchComponent
+                treeNode={this.treeNode}
+                createApi={this.createApi}
+            />
+        );
+    }
+}
+
+@injectable()
+export class ShareSketchDialogProps extends DialogProps {
+    readonly node: any;
+    readonly createApi: CreateApi;
+}
+
+@injectable()
+export class ShareSketchDialog extends AbstractDialog<void> {
+    protected widget: ShareSketchWidget;
+
+    constructor(
+        @inject(ShareSketchDialogProps)
+        protected readonly props: ShareSketchDialogProps
+    ) {
+        super({ title: props.title });
+        this.contentNode.classList.add('arduino-share-sketch-dialog');
+        this.widget = new ShareSketchWidget(props.node, props.createApi);
+    }
+
+    get value(): void {
+        return;
+    }
+    protected onAfterAttach(msg: Message): void {
+        if (this.widget.isAttached) {
+            Widget.detach(this.widget);
+        }
+        Widget.attach(this.widget, this.contentNode);
+        super.onAfterAttach(msg);
+        this.update();
+    }
+
+    protected onUpdateRequest(msg: Message): void {
+        super.onUpdateRequest(msg);
+        this.widget.update();
+    }
+
+    protected onActivateRequest(msg: Message): void {
+        super.onActivateRequest(msg);
+        this.widget.activate();
+    }
+}

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

@@ -0,0 +1,69 @@
+import { inject, injectable } from 'inversify';
+import { Widget } from '@phosphor/widgets';
+import { CancellationTokenSource } from '@theia/core/lib/common/cancellation';
+import {
+    ConfirmDialog,
+    ConfirmDialogProps,
+    DialogError,
+} from '@theia/core/lib/browser/dialogs';
+
+@injectable()
+export class DoNotAskAgainConfirmDialogProps extends ConfirmDialogProps {
+    readonly onAccept: () => Promise<void>;
+}
+
+@injectable()
+export class DoNotAskAgainConfirmDialog extends ConfirmDialog {
+    protected readonly doNotAskAgainCheckbox: HTMLInputElement;
+
+    constructor(
+        @inject(DoNotAskAgainConfirmDialogProps)
+        protected readonly props: DoNotAskAgainConfirmDialogProps
+    ) {
+        super(props);
+        this.controlPanel.removeChild(this.errorMessageNode);
+        const doNotAskAgainNode = document.createElement('div');
+        doNotAskAgainNode.setAttribute('style', 'flex: 2');
+        this.controlPanel.insertBefore(
+            doNotAskAgainNode,
+            this.controlPanel.firstChild
+        );
+        const doNotAskAgainLabel = document.createElement('label');
+        doNotAskAgainLabel.classList.add('flex-line');
+        doNotAskAgainNode.appendChild(doNotAskAgainLabel);
+        doNotAskAgainLabel.textContent = "Don't ask again";
+        this.doNotAskAgainCheckbox = document.createElement('input');
+        this.doNotAskAgainCheckbox.setAttribute('align-self', 'center');
+        doNotAskAgainLabel.appendChild(this.doNotAskAgainCheckbox);
+        this.doNotAskAgainCheckbox.type = 'checkbox';
+    }
+
+    protected async accept(): Promise<void> {
+        if (!this.resolve) {
+            return;
+        }
+        this.acceptCancellationSource.cancel();
+        this.acceptCancellationSource = new CancellationTokenSource();
+        const token = this.acceptCancellationSource.token;
+        const value = this.value;
+        const error = await this.isValid(value, 'open');
+        if (token.isCancellationRequested) {
+            return;
+        }
+        if (!DialogError.getResult(error)) {
+            this.setErrorMessage(error);
+        } else {
+            if (this.doNotAskAgainCheckbox.checked) {
+                await this.props.onAccept();
+            }
+            this.resolve(value);
+            Widget.detach(this);
+        }
+    }
+
+    protected setErrorMessage(error: DialogError): void {
+        if (this.acceptButton) {
+            this.acceptButton.disabled = !DialogError.getResult(error);
+        }
+    }
+}

arduino-ide-extension/src/browser/editor-mode.ts

@@ -1,14 +1,12 @@
 import { injectable, inject } from 'inversify';
-import { ApplicationShell, FrontendApplicationContribution, FrontendApplication, Widget } from '@theia/core/lib/browser';
-import { EditorWidget } from '@theia/editor/lib/browser';
-import { OutputWidget } from '@theia/output/lib/browser/output-widget';
+import {
+    FrontendApplicationContribution,
+    FrontendApplication,
+} from '@theia/core/lib/browser';
 import { MainMenuManager } from '../common/main-menu-manager';
-import { BoardsListWidget } from './boards/boards-list-widget';
-import { LibraryListWidget } from './library/library-list-widget';
 
 @injectable()
 export class EditorMode implements FrontendApplicationContribution {
-
     @inject(MainMenuManager)
     protected readonly mainMenuManager: MainMenuManager;
 
@@ -16,58 +14,26 @@ export class EditorMode implements FrontendApplicationContribution {
 
     onStart(app: FrontendApplication): void {
         this.app = app;
-        if (this.proMode) {
-            // We use this CSS class on the body to modify the visibility of the close button for the editors and views.
-            document.body.classList.add(EditorMode.PRO_MODE_KEY);
-        }
-    }
-
-    get proMode(): boolean {
-        const value = window.localStorage.getItem(EditorMode.PRO_MODE_KEY);
-        return value === 'true';
-    }
-
-    async toggleProMode(): Promise<void> {
-        const oldState = this.proMode;
-        const inAdvancedMode = !oldState;
-        window.localStorage.setItem(EditorMode.PRO_MODE_KEY, String(inAdvancedMode));
-        if (!inAdvancedMode) {
-            const { shell } = this.app;
-            // Close all widgets that are neither editor nor `Output` / `Boards Manager` / `Library Manager`.
-            for (const area of ['left', 'right', 'bottom', 'main'] as Array<ApplicationShell.Area>) {
-                shell.closeTabs(area, title => !this.isInSimpleMode(title.owner));
-            }
-        }
-        // `storeLayout` has a sync API but the implementation is async, we store the layout manually before we reload the page.
-        // See: https://github.com/eclipse-theia/theia/issues/6579
-        // XXX: hack instead of injecting the `ArduinoShellLayoutRestorer` we have to retrieve it from the application to avoid DI cycle.
-        const layoutRestorer = (this.app as any).layoutRestorer as { storeLayoutAsync(app: FrontendApplication): Promise<void> };
-        await layoutRestorer.storeLayoutAsync(this.app);
-        window.location.reload(true);
-    }
-
-    protected isInSimpleMode(widget: Widget): boolean {
-        return widget instanceof EditorWidget
-            || widget instanceof OutputWidget
-            || widget instanceof BoardsListWidget
-            || widget instanceof LibraryListWidget;
     }
 
     get compileForDebug(): boolean {
-        const value = window.localStorage.getItem(EditorMode.COMPILE_FOR_DEBUG_KEY);
+        const value = window.localStorage.getItem(
+            EditorMode.COMPILE_FOR_DEBUG_KEY
+        );
         return value === 'true';
     }
 
     async toggleCompileForDebug(): Promise<void> {
         const oldState = this.compileForDebug;
         const newState = !oldState;
-        window.localStorage.setItem(EditorMode.COMPILE_FOR_DEBUG_KEY, String(newState));
+        window.localStorage.setItem(
+            EditorMode.COMPILE_FOR_DEBUG_KEY,
+            String(newState)
+        );
         this.mainMenuManager.update();
     }
-
 }
 
 export namespace EditorMode {
-    export const PRO_MODE_KEY = 'arduino-advanced-mode';
     export const COMPILE_FOR_DEBUG_KEY = 'arduino-compile-for-debug';
 }

arduino-ide-extension/src/browser/library/library-list-widget.ts

@@ -1,18 +1,25 @@
 import { injectable, postConstruct, inject } from 'inversify';
-import { LibraryPackage, LibraryService } from '../../common/protocol/library-service';
+import { Message } from '@phosphor/messaging';
+import { addEventListener } from '@theia/core/lib/browser/widgets/widget';
+import { AbstractDialog, DialogProps } from '@theia/core/lib/browser/dialogs';
+import {
+    LibraryPackage,
+    LibraryService,
+} from '../../common/protocol/library-service';
 import { ListWidget } from '../widgets/component-list/list-widget';
+import { Installable } from '../../common/protocol';
 import { ListItemRenderer } from '../widgets/component-list/list-item-renderer';
 
 @injectable()
 export class LibraryListWidget extends ListWidget<LibraryPackage> {
-
     static WIDGET_ID = 'library-list-widget';
     static WIDGET_LABEL = 'Library Manager';
 
     constructor(
         @inject(LibraryService) protected service: LibraryService,
-        @inject(ListItemRenderer) protected itemRenderer: ListItemRenderer<LibraryPackage>) {
-
+        @inject(ListItemRenderer)
+        protected itemRenderer: ListItemRenderer<LibraryPackage>
+    ) {
         super({
             id: LibraryListWidget.WIDGET_ID,
             label: LibraryListWidget.WIDGET_LABEL,
@@ -20,7 +27,8 @@ export class LibraryListWidget extends ListWidget<LibraryPackage> {
             searchable: service,
             installable: service,
             itemLabel: (item: LibraryPackage) => item.name,
-            itemRenderer
+            itemDeprecated: (item: LibraryPackage) => item.deprecated,
+            itemRenderer,
         });
     }
 
@@ -28,9 +36,166 @@ export class LibraryListWidget extends ListWidget<LibraryPackage> {
     protected init(): void {
         super.init();
         this.toDispose.pushAll([
-            this.notificationCenter.onLibraryInstalled(() => this.refresh(undefined)),
-            this.notificationCenter.onLibraryUninstalled(() => this.refresh(undefined)),
+            this.notificationCenter.onLibraryInstalled(() =>
+                this.refresh(undefined)
+            ),
+            this.notificationCenter.onLibraryUninstalled(() =>
+                this.refresh(undefined)
+            ),
         ]);
     }
 
+    protected async install({
+        item,
+        progressId,
+        version,
+    }: {
+        item: LibraryPackage;
+        progressId: string;
+        version: Installable.Version;
+    }): Promise<void> {
+        const dependencies = await this.service.listDependencies({
+            item,
+            version,
+            filterSelf: true,
+        });
+        let installDependencies: boolean | undefined = undefined;
+        if (dependencies.length) {
+            const message = document.createElement('div');
+            message.innerHTML = `The library <b>${
+                item.name
+            }:${version}</b> needs ${
+                dependencies.length === 1
+                    ? 'another dependency'
+                    : 'some other dependencies'
+            } currently not installed:`;
+            const listContainer = document.createElement('div');
+            listContainer.style.maxHeight = '300px';
+            listContainer.style.overflowY = 'auto';
+            const list = document.createElement('ul');
+            list.style.listStyleType = 'none';
+            for (const { name } of dependencies) {
+                const listItem = document.createElement('li');
+                listItem.textContent = ` - ${name}`;
+                listItem.style.fontWeight = 'bold';
+                list.appendChild(listItem);
+            }
+            listContainer.appendChild(list);
+            message.appendChild(listContainer);
+            const question = document.createElement('div');
+            question.textContent = `Would you like to install ${
+                dependencies.length === 1
+                    ? 'the missing dependency'
+                    : 'all the missing dependencies'
+            }?`;
+            message.appendChild(question);
+            const result = await new MessageBoxDialog({
+                title: `Dependencies for library ${item.name}:${version}`,
+                message,
+                buttons: ['Install all', `Install ${item.name} only`, 'Cancel'],
+                maxWidth: 740, // Aligned with `settings-dialog.css`.
+            }).open();
+
+            if (result) {
+                const { response } = result;
+                if (response === 0) {
+                    // All
+                    installDependencies = true;
+                } else if (response === 1) {
+                    // Current only
+                    installDependencies = false;
+                }
+            }
+        } else {
+            // The lib does not have any dependencies.
+            installDependencies = false;
+        }
+
+        if (typeof installDependencies === 'boolean') {
+            await this.service.install({
+                item,
+                version,
+                progressId,
+                installDependencies,
+            });
+            this.messageService.info(
+                `Successfully installed library ${item.name}:${version}`,
+                { timeout: 3000 }
+            );
+        }
+    }
+
+    protected async uninstall({
+        item,
+        progressId,
+    }: {
+        item: LibraryPackage;
+        progressId: string;
+    }): Promise<void> {
+        await super.uninstall({ item, progressId });
+        this.messageService.info(
+            `Successfully uninstalled library ${item.name}:${item.installedVersion}`,
+            { timeout: 3000 }
+        );
+    }
+}
+
+class MessageBoxDialog extends AbstractDialog<MessageBoxDialog.Result> {
+    protected response: number;
+
+    constructor(protected readonly options: MessageBoxDialog.Options) {
+        super(options);
+        this.contentNode.appendChild(
+            this.createMessageNode(this.options.message)
+        );
+        (options.buttons || ['OK']).forEach((text, index) => {
+            const button = this.createButton(text);
+            button.classList.add(index === 0 ? 'main' : 'secondary');
+            this.controlPanel.appendChild(button);
+            this.toDisposeOnDetach.push(
+                addEventListener(button, 'click', () => {
+                    this.response = index;
+                    this.accept();
+                })
+            );
+        });
+    }
+
+    protected onCloseRequest(message: Message): void {
+        super.onCloseRequest(message);
+        this.accept();
+    }
+
+    get value(): MessageBoxDialog.Result {
+        return { response: this.response };
+    }
+
+    protected createMessageNode(message: string | HTMLElement): HTMLElement {
+        if (typeof message === 'string') {
+            const messageNode = document.createElement('div');
+            messageNode.textContent = message;
+            return messageNode;
+        }
+        return message;
+    }
+
+    protected handleEnter(event: KeyboardEvent): boolean | void {
+        this.response = 0;
+        super.handleEnter(event);
+    }
+}
+export namespace MessageBoxDialog {
+    export interface Options extends DialogProps {
+        /**
+         * When empty, `['OK']` will be inferred.
+         */
+        buttons?: string[];
+        message: string | HTMLElement;
+    }
+    export interface Result {
+        /**
+         * The index of `buttons` that was clicked.
+         */
+        readonly response: number;
+    }
 }

arduino-ide-extension/src/browser/library/library-widget-frontend-contribution.ts

@@ -6,18 +6,20 @@ import { LibraryListWidget } from './library-list-widget';
 import { ArduinoMenus } from '../menu/arduino-menus';
 
 @injectable()
-export class LibraryListWidgetFrontendContribution extends AbstractViewContribution<LibraryListWidget> implements FrontendApplicationContribution {
-
+export class LibraryListWidgetFrontendContribution
+    extends AbstractViewContribution<LibraryListWidget>
+    implements FrontendApplicationContribution
+{
     constructor() {
         super({
             widgetId: LibraryListWidget.WIDGET_ID,
             widgetName: LibraryListWidget.WIDGET_LABEL,
             defaultWidgetOptions: {
                 area: 'left',
-                rank: 700
+                rank: 3,
             },
             toggleCommandId: `${LibraryListWidget.WIDGET_ID}:toggle`,
-            toggleKeybinding: 'CtrlCmd+Shift+I'
+            toggleKeybinding: 'CtrlCmd+Shift+I',
         });
     }
 
@@ -30,9 +32,8 @@ export class LibraryListWidgetFrontendContribution extends AbstractViewContribut
             menus.registerMenuAction(ArduinoMenus.TOOLS__MAIN_GROUP, {
                 commandId: this.toggleCommand.id,
                 label: 'Manage Libraries...',
-                order: '3'
+                order: '3',
             });
         }
     }
-
 }

arduino-ide-extension/src/browser/local-cache/local-cache-fs-provider.ts

@@ -0,0 +1,167 @@
+import { inject, injectable } from 'inversify';
+import { URI as Uri } from 'vscode-uri';
+import URI from '@theia/core/lib/common/uri';
+import { Deferred } from '@theia/core/lib/common/promise-util';
+import {
+    FileSystemProvider,
+    FileSystemProviderError,
+    FileSystemProviderErrorCode,
+} from '@theia/filesystem/lib/common/files';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { DelegatingFileSystemProvider } from '@theia/filesystem/lib/common/delegating-file-system-provider';
+import {
+    FileService,
+    FileServiceContribution,
+} from '@theia/filesystem/lib/browser/file-service';
+import { AuthenticationClientService } from '../auth/authentication-client-service';
+import { AuthenticationSession } from '../../common/protocol/authentication-service';
+import { ConfigService } from '../../common/protocol';
+
+export namespace LocalCacheUri {
+    export const scheme = 'arduino-local-cache';
+    export const root = new URI(
+        Uri.parse('/').with({ scheme, authority: 'create' })
+    );
+}
+
+@injectable()
+export class LocalCacheFsProvider
+    implements
+        FileServiceContribution,
+        DelegatingFileSystemProvider.URIConverter
+{
+    @inject(ConfigService)
+    protected readonly configService: ConfigService;
+
+    @inject(AuthenticationClientService)
+    protected readonly authenticationService: AuthenticationClientService;
+
+    // TODO: do we need this? Cannot we `await` on the `init` call from `registerFileSystemProviders`?
+    readonly ready = new Deferred<void>();
+
+    private _localCacheRoot: URI;
+
+    registerFileSystemProviders(fileService: FileService): void {
+        fileService.onWillActivateFileSystemProvider(async (event) => {
+            if (event.scheme === LocalCacheUri.scheme) {
+                event.waitUntil(
+                    (async () => {
+                        this.init(fileService);
+                        const provider = await this.createProvider(fileService);
+                        fileService.registerProvider(
+                            LocalCacheUri.scheme,
+                            provider
+                        );
+                    })()
+                );
+            }
+        });
+    }
+
+    to(resource: URI): URI | undefined {
+        const relativePath = LocalCacheUri.root.relative(resource);
+        if (relativePath) {
+            return this.currentUserUri.resolve(relativePath).normalizePath();
+        }
+        return undefined;
+    }
+
+    from(resource: URI): URI | undefined {
+        const relativePath = this.currentUserUri.relative(resource);
+        if (relativePath) {
+            return LocalCacheUri.root.resolve(relativePath);
+        }
+        return undefined;
+    }
+
+    protected async createProvider(
+        fileService: FileService
+    ): Promise<FileSystemProvider> {
+        const delegate = await fileService.activateProvider('file');
+        await this.ready.promise;
+        return new DelegatingFileSystemProvider(
+            delegate,
+            {
+                uriConverter: this,
+            },
+            new DisposableCollection(
+                delegate.watch(this.localCacheRoot, {
+                    excludes: [],
+                    recursive: true,
+                })
+            )
+        );
+    }
+
+    protected async init(fileService: FileService): Promise<void> {
+        const config = await this.configService.getConfiguration();
+        this._localCacheRoot = new URI(config.dataDirUri);
+        for (const segment of ['RemoteSketchbook', 'ArduinoCloud']) {
+            this._localCacheRoot = this._localCacheRoot.resolve(segment);
+            await fileService.createFolder(this._localCacheRoot);
+        }
+        this.session(fileService).then(() => this.ready.resolve());
+        this.authenticationService.onSessionDidChange(async (session) => {
+            if (session) {
+                await this.ensureExists(session, fileService);
+            }
+        });
+    }
+
+    private get currentUserUri(): URI {
+        const { session } = this.authenticationService;
+        if (!session) {
+            throw new FileSystemProviderError(
+                'Not logged in.',
+                FileSystemProviderErrorCode.NoPermissions
+            );
+        }
+        return this.toUri(session);
+    }
+
+    private get localCacheRoot(): URI {
+        return this._localCacheRoot;
+    }
+
+    private async session(
+        fileService: FileService
+    ): Promise<AuthenticationSession> {
+        return new Promise<AuthenticationSession>(async (resolve) => {
+            const { session } = this.authenticationService;
+            if (session) {
+                await this.ensureExists(session, fileService);
+                resolve(session);
+                return;
+            }
+            const toDispose = new DisposableCollection();
+            toDispose.push(
+                this.authenticationService.onSessionDidChange(
+                    async (session) => {
+                        if (session) {
+                            await this.ensureExists(session, fileService);
+                            toDispose.dispose();
+                            resolve(session);
+                        }
+                    }
+                )
+            );
+        });
+    }
+
+    private async ensureExists(
+        session: AuthenticationSession,
+        fileService: FileService
+    ): Promise<URI> {
+        const uri = this.toUri(session);
+        const exists = await fileService.exists(uri);
+        if (!exists) {
+            await fileService.createFolder(uri);
+        }
+        return uri;
+    }
+
+    private toUri(session: AuthenticationSession): URI {
+        // Hack: instead of getting the UUID only, we get `auth0|UUID` after the authentication. `|` cannot be part of filesystem path or filename.
+        return this._localCacheRoot.resolve(session.id.split('|')[1]);
+    }
+}

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

@@ -1,31 +1,82 @@
 import { isOSX } from '@theia/core/lib/common/os';
 import { CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';
-import { MAIN_MENU_BAR } from '@theia/core/lib/common/menu';
+import {
+    MAIN_MENU_BAR,
+    MenuModelRegistry,
+    MenuNode,
+    MenuPath,
+    SubMenuOptions,
+} from '@theia/core/lib/common/menu';
 
 export namespace ArduinoMenus {
-
     // Main menu
     // -- File
     export const FILE__SKETCH_GROUP = [...CommonMenus.FILE, '0_sketch'];
     export const FILE__PRINT_GROUP = [...CommonMenus.FILE, '1_print'];
-    // XXX: on macOS, the settings group is not under `File`
-    export const FILE__SETTINGS_GROUP = [...(isOSX ? MAIN_MENU_BAR : CommonMenus.FILE), '2_settings'];
+    // XXX: on macOS, the "Preferences" and "Advanced" group is not under `File`
+    // The empty path ensures no top level menu is created for the preferences, even if they contains sub menus
+    export const FILE__PREFERENCES_GROUP = [
+        ...(isOSX ? [''] : CommonMenus.FILE),
+        '2_preferences',
+    ];
+    export const FILE__ADVANCED_GROUP = [
+        ...(isOSX ? [''] : CommonMenus.FILE),
+        '3_advanced',
+    ];
+    export const FILE__ADVANCED_SUBMENU = [
+        ...FILE__ADVANCED_GROUP,
+        '0_advanced_sub',
+    ];
+
     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,
+        '1_sketchbook',
+    ];
+
     // -- File / Examples
-    export const FILE__EXAMPLES_SUBMENU = [...FILE__SKETCH_GROUP, '0_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'];
-    export const EXAMPLES__USER_LIBS_GROUP = [...FILE__EXAMPLES_SUBMENU, '3_user_libs'];
+    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',
+    ];
+    export const EXAMPLES__USER_LIBS_GROUP = [
+        ...FILE__EXAMPLES_SUBMENU,
+        '3_user_libs',
+    ];
 
     // -- Edit
     // `Copy`, `Copy to Forum`, `Paste`, etc.
     // Note: `1_undo` is the first group from Theia, we start with `2`
-    export const EDIT__TEXT_CONTROL_GROUP = [...CommonMenus.EDIT, '2_text_control'];
+    export const EDIT__TEXT_CONTROL_GROUP = [
+        ...CommonMenus.EDIT,
+        '2_text_control',
+    ];
     // `Comment/Uncomment`, etc.
-    export const EDIT__CODE_CONTROL_GROUP = [...CommonMenus.EDIT, '3_code_control'];
-    export const EDIT__FONT_CONTROL_GROUP = [...CommonMenus.EDIT, '4_font_control'];
+    export const EDIT__CODE_CONTROL_GROUP = [
+        ...CommonMenus.EDIT,
+        '3_code_control',
+    ];
+    export const EDIT__FONT_CONTROL_GROUP = [
+        ...CommonMenus.EDIT,
+        '4_font_control',
+    ];
     export const EDIT__FIND_GROUP = [...CommonMenus.EDIT, '5_find'];
 
     // -- Sketch
@@ -37,30 +88,111 @@ export namespace ArduinoMenus {
     export const TOOLS = [...MAIN_MENU_BAR, '4_tools'];
     // `Auto Format`, `Library Manager...`, `Boards Manager...`
     export const TOOLS__MAIN_GROUP = [...TOOLS, '0_main'];
+    // `Board`, `Port`, and `Get Board Info`.
+    export const TOOLS__BOARD_SELECTION_GROUP = [...TOOLS, '2_board_selection'];
     // Core settings, such as `Processor` and `Programmers` for the board and `Burn Bootloader`
-    export const TOOLS__BOARD_SETTINGS_GROUP = [...TOOLS, '1_board_settings'];
+    export const TOOLS__BOARD_SETTINGS_GROUP = [...TOOLS, '3_board_settings'];
 
     // -- Help
+    // `Getting Started`, `Environment`, `Troubleshooting`, etc.
+    export const HELP__MAIN_GROUP = [...CommonMenus.HELP, '0_main'];
+    // `Find in reference`, `FAQ`, etc.
+    export const HELP__FIND_GROUP = [...CommonMenus.HELP, '1_find'];
+    // `Advanced Mode`.
+    // XXX: this will be removed.
+    export const HELP__CONTROL_GROUP = [...CommonMenus.HELP, '2_control'];
     // `About` group
     // XXX: on macOS, the about group is not under `Help`
-    export const HELP__ABOUT_GROUP = [...(isOSX ? MAIN_MENU_BAR : CommonMenus.HELP), '999_about'];
+    export const HELP__ABOUT_GROUP = [
+        ...(isOSX ? MAIN_MENU_BAR : CommonMenus.HELP),
+        '999_about',
+    ];
 
     // ------------
 
     // Context menus
     // -- Open
     export const OPEN_SKETCH__CONTEXT = ['arduino-open-sketch--context'];
-    export const OPEN_SKETCH__CONTEXT__OPEN_GROUP = [...OPEN_SKETCH__CONTEXT, '0_open'];
-    export const OPEN_SKETCH__CONTEXT__RECENT_GROUP = [...OPEN_SKETCH__CONTEXT, '1_recent'];
-    export const OPEN_SKETCH__CONTEXT__EXAMPLES_GROUP = [...OPEN_SKETCH__CONTEXT, '2_examples'];
+    export const OPEN_SKETCH__CONTEXT__OPEN_GROUP = [
+        ...OPEN_SKETCH__CONTEXT,
+        '0_open',
+    ];
+    export const OPEN_SKETCH__CONTEXT__RECENT_GROUP = [
+        ...OPEN_SKETCH__CONTEXT,
+        '1_recent',
+    ];
+    export const OPEN_SKETCH__CONTEXT__EXAMPLES_GROUP = [
+        ...OPEN_SKETCH__CONTEXT,
+        '2_examples',
+    ];
 
     // -- Sketch control
     export const SKETCH_CONTROL__CONTEXT = ['arduino-sketch-control--context'];
     // `New Tab`, `Rename`, `Delete`
-    export const SKETCH_CONTROL__CONTEXT__MAIN_GROUP = [...SKETCH_CONTROL__CONTEXT, '0_main'];
+    export const SKETCH_CONTROL__CONTEXT__MAIN_GROUP = [
+        ...SKETCH_CONTROL__CONTEXT,
+        '0_main',
+    ];
     // `Previous Tab`, `Next Tab`
-    export const SKETCH_CONTROL__CONTEXT__NAVIGATION_GROUP = [...SKETCH_CONTROL__CONTEXT, '1_navigation'];
+    export const SKETCH_CONTROL__CONTEXT__NAVIGATION_GROUP = [
+        ...SKETCH_CONTROL__CONTEXT,
+        '1_navigation',
+    ];
     // Sketch files opened in editors
-    export const SKETCH_CONTROL__CONTEXT__RESOURCES_GROUP = [...SKETCH_CONTROL__CONTEXT, '2_resources'];
-
+    export const SKETCH_CONTROL__CONTEXT__RESOURCES_GROUP = [
+        ...SKETCH_CONTROL__CONTEXT,
+        '2_resources',
+    ];
+}
+
+/**
+ * This is a hack. It removes a submenu with all its children if any.
+ * Theia cannot dispose submenu entries with a proper API: https://github.com/eclipse-theia/theia/issues/7299
+ */
+export function unregisterSubmenu(
+    menuPath: string[],
+    menuRegistry: MenuModelRegistry
+): void {
+    if (menuPath.length < 2) {
+        throw new Error(
+            `Expected at least two item as a menu-path. Got ${JSON.stringify(
+                menuPath
+            )} instead.`
+        );
+    }
+    const toRemove = menuPath[menuPath.length - 1];
+    const parentMenuPath = menuPath.slice(0, menuPath.length - 1);
+    // This is unsafe. Calling `getMenu` with a non-existing menu-path will result in a new menu creation.
+    // https://github.com/eclipse-theia/theia/issues/7300
+    const parent = menuRegistry.getMenu(parentMenuPath);
+    const index = parent.children.findIndex(({ id }) => id === toRemove);
+    if (index === -1) {
+        throw new Error(
+            `Could not find menu with menu-path: ${JSON.stringify(menuPath)}.`
+        );
+    }
+    (parent.children as Array<MenuNode>).splice(index, 1);
+}
+
+/**
+ * Special menu node that is not backed by any commands and is always disabled.
+ */
+export class PlaceholderMenuNode implements MenuNode {
+    constructor(
+        protected readonly menuPath: MenuPath,
+        readonly label: string,
+        protected options: SubMenuOptions = { order: '0' }
+    ) {}
+
+    get icon(): string | undefined {
+        return this.options?.iconClass;
+    }
+
+    get sortString(): string {
+        return this.options?.order || this.label;
+    }
+
+    get id(): string {
+        return [...this.menuPath, 'placeholder'].join('-');
+    }
 }

arduino-ide-extension/src/browser/monitor/monitor-connection.ts

@@ -3,9 +3,19 @@ import { deepClone } from '@theia/core/lib/common/objects';
 import { Emitter, Event } from '@theia/core/lib/common/event';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
-import { MonitorService, MonitorConfig, MonitorError, Status, MonitorReadEvent } from '../../common/protocol/monitor-service';
+import {
+    MonitorService,
+    MonitorConfig,
+    MonitorError,
+    Status,
+} from '../../common/protocol/monitor-service';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import { Port, Board, BoardsService, AttachedBoardsChangeEvent } from '../../common/protocol/boards-service';
+import {
+    Port,
+    Board,
+    BoardsService,
+    AttachedBoardsChangeEvent,
+} from '../../common/protocol/boards-service';
 import { MonitorServiceClientImpl } from './monitor-service-client-impl';
 import { BoardsConfig } from '../boards/boards-config';
 import { MonitorModel } from './monitor-model';
@@ -13,7 +23,6 @@ import { NotificationCenter } from '../notification-center';
 
 @injectable()
 export class MonitorConnection {
-
     @inject(MonitorModel)
     protected readonly monitorModel: MonitorModel;
 
@@ -43,12 +52,14 @@ export class MonitorConnection {
      * Note: The idea is to toggle this property from the UI (`Monitor` view)
      * and the boards config and the boards attachment/detachment logic can be at on place, here.
      */
-    protected _autoConnect: boolean = false;
-    protected readonly onConnectionChangedEmitter = new Emitter<MonitorConnection.State | undefined>();
+    protected _autoConnect = false;
+    protected readonly onConnectionChangedEmitter = new Emitter<
+        MonitorConnection.State | undefined
+    >();
     /**
      * This emitter forwards all read events **iff** the connection is established.
      */
-    protected readonly onReadEmitter = new Emitter<MonitorReadEvent>();
+    protected readonly onReadEmitter = new Emitter<{ message: string }>();
 
     /**
      * Array for storing previous monitor errors received from the server, and based on the number of elements in this array,
@@ -60,13 +71,7 @@ export class MonitorConnection {
 
     @postConstruct()
     protected init(): void {
-        // Forward the messages from the board **iff** connected.
-        this.monitorServiceClient.onRead(event => {
-            if (this.connected) {
-                this.onReadEmitter.fire(event);
-            }
-        });
-        this.monitorServiceClient.onError(async error => {
+        this.monitorServiceClient.onError(async (error) => {
             let shouldReconnect = false;
             if (this.state) {
                 const { code, config } = error;
@@ -74,21 +79,40 @@ export class MonitorConnection {
                 const options = { timeout: 3000 };
                 switch (code) {
                     case MonitorError.ErrorCodes.CLIENT_CANCEL: {
-                        console.debug(`Connection was canceled by client: ${MonitorConnection.State.toString(this.state)}.`);
+                        console.debug(
+                            `Connection was canceled by client: ${MonitorConnection.State.toString(
+                                this.state
+                            )}.`
+                        );
                         break;
                     }
                     case MonitorError.ErrorCodes.DEVICE_BUSY: {
-                        this.messageService.warn(`Connection failed. Serial port is busy: ${Port.toString(port)}.`, options);
+                        this.messageService.warn(
+                            `Connection failed. Serial port is busy: ${Port.toString(
+                                port
+                            )}.`,
+                            options
+                        );
                         shouldReconnect = this.autoConnect;
                         this.monitorErrors.push(error);
                         break;
                     }
                     case MonitorError.ErrorCodes.DEVICE_NOT_CONFIGURED: {
-                        this.messageService.info(`Disconnected ${Board.toString(board, { useFqbn: false })} from ${Port.toString(port)}.`, options);
+                        this.messageService.info(
+                            `Disconnected ${Board.toString(board, {
+                                useFqbn: false,
+                            })} from ${Port.toString(port)}.`,
+                            options
+                        );
                         break;
                     }
                     case undefined: {
-                        this.messageService.error(`Unexpected error. Reconnecting ${Board.toString(board)} on port ${Port.toString(port)}.`, options);
+                        this.messageService.error(
+                            `Unexpected error. Reconnecting ${Board.toString(
+                                board
+                            )} on port ${Port.toString(port)}.`,
+                            options
+                        );
                         console.error(JSON.stringify(error));
                         shouldReconnect = this.connected && this.autoConnect;
                         break;
@@ -99,32 +123,62 @@ export class MonitorConnection {
                 this.onConnectionChangedEmitter.fire(this.state);
                 if (shouldReconnect) {
                     if (this.monitorErrors.length >= 10) {
-                        this.messageService.warn(`Failed to reconnect ${Board.toString(board, { useFqbn: false })} to the the serial-monitor after 10 consecutive attempts. The ${Port.toString(port)} serial port is busy. after 10 consecutive attempts.`);
+                        this.messageService.warn(
+                            `Failed to reconnect ${Board.toString(board, {
+                                useFqbn: false,
+                            })} to the the serial-monitor after 10 consecutive attempts. The ${Port.toString(
+                                port
+                            )} serial port is busy. after 10 consecutive attempts.`
+                        );
                         this.monitorErrors.length = 0;
                     } else {
-                        const attempts = (this.monitorErrors.length || 1);
+                        const attempts = this.monitorErrors.length || 1;
                         if (this.reconnectTimeout !== undefined) {
                             // Clear the previous timer.
                             window.clearTimeout(this.reconnectTimeout);
                         }
                         const timeout = attempts * 1000;
-                        this.messageService.warn(`Reconnecting ${Board.toString(board, { useFqbn: false })} to ${Port.toString(port)} in ${attempts} seconds...`, { timeout });
-                        this.reconnectTimeout = window.setTimeout(() => this.connect(oldState.config), timeout);
+                        this.messageService.warn(
+                            `Reconnecting ${Board.toString(board, {
+                                useFqbn: false,
+                            })} to ${Port.toString(
+                                port
+                            )} in ${attempts} seconds...`,
+                            { timeout }
+                        );
+                        this.reconnectTimeout = window.setTimeout(
+                            () => this.connect(oldState.config),
+                            timeout
+                        );
                     }
                 }
             }
         });
-        this.boardsServiceProvider.onBoardsConfigChanged(this.handleBoardConfigChange.bind(this));
-        this.notificationCenter.onAttachedBoardsChanged(event => {
+        this.boardsServiceProvider.onBoardsConfigChanged(
+            this.handleBoardConfigChange.bind(this)
+        );
+        this.notificationCenter.onAttachedBoardsChanged((event) => {
             if (this.autoConnect && this.connected) {
                 const { boardsConfig } = this.boardsServiceProvider;
-                if (this.boardsServiceProvider.canUploadTo(boardsConfig, { silent: false })) {
+                if (
+                    this.boardsServiceProvider.canUploadTo(boardsConfig, {
+                        silent: false,
+                    })
+                ) {
                     const { attached } = AttachedBoardsChangeEvent.diff(event);
-                    if (attached.boards.some(board => !!board.port && BoardsConfig.Config.sameAs(boardsConfig, board))) {
-                        const { selectedBoard: board, selectedPort: port } = boardsConfig;
+                    if (
+                        attached.boards.some(
+                            (board) =>
+                                !!board.port &&
+                                BoardsConfig.Config.sameAs(boardsConfig, board)
+                        )
+                    ) {
+                        const { selectedBoard: board, selectedPort: port } =
+                            boardsConfig;
                         const { baudRate } = this.monitorModel;
-                        this.disconnect()
-                            .then(() => this.connect({ board, port, baudRate }));
+                        this.disconnect().then(() =>
+                            this.connect({ board, port, baudRate })
+                        );
                     }
                 }
             }
@@ -157,10 +211,12 @@ export class MonitorConnection {
         if (!oldValue && value) {
             // We have to make sure the previous boards config has been restored.
             // Otherwise, we might start the auto-connection without configured boards.
-            this.applicationState.reachedState('started_contributions').then(() => {
-                const { boardsConfig } = this.boardsServiceProvider;
-                this.handleBoardConfigChange(boardsConfig);
-            });
+            this.applicationState
+                .reachedState('started_contributions')
+                .then(() => {
+                    const { boardsConfig } = this.boardsServiceProvider;
+                    this.handleBoardConfigChange(boardsConfig);
+                });
         } else if (oldValue && !value) {
             if (this.reconnectTimeout !== undefined) {
                 window.clearTimeout(this.reconnectTimeout);
@@ -176,11 +232,29 @@ export class MonitorConnection {
                 return disconnectStatus;
             }
         }
-        console.info(`>>> Creating serial monitor connection for ${Board.toString(config.board)} on port ${Port.toString(config.port)}...`);
+        console.info(
+            `>>> Creating serial monitor connection for ${Board.toString(
+                config.board
+            )} on port ${Port.toString(config.port)}...`
+        );
         const connectStatus = await this.monitorService.connect(config);
         if (Status.isOK(connectStatus)) {
+            const requestMessage = () => {
+                this.monitorService.request().then(({ message }) => {
+                    if (this.connected) {
+                        this.onReadEmitter.fire({ message });
+                        requestMessage();
+                    }
+                });
+            };
+            requestMessage();
             this.state = { config };
-            console.info(`<<< Serial monitor connection created for ${Board.toString(config.board, { useFqbn: false })} on port ${Port.toString(config.port)}.`);
+            console.info(
+                `<<< Serial monitor connection created for ${Board.toString(
+                    config.board,
+                    { useFqbn: false }
+                )} on port ${Port.toString(config.port)}.`
+            );
         }
         this.onConnectionChangedEmitter.fire(this.state);
         return Status.isOK(connectStatus);
@@ -197,9 +271,17 @@ export class MonitorConnection {
         console.log('>>> Disposing existing monitor connection...');
         const status = await this.monitorService.disconnect();
         if (Status.isOK(status)) {
-            console.log(`<<< Disposed connection. Was: ${MonitorConnection.State.toString(stateCopy)}`);
+            console.log(
+                `<<< Disposed connection. Was: ${MonitorConnection.State.toString(
+                    stateCopy
+                )}`
+            );
         } else {
-            console.warn(`<<< Could not dispose connection. Activate connection: ${MonitorConnection.State.toString(stateCopy)}`);
+            console.warn(
+                `<<< Could not dispose connection. Activate connection: ${MonitorConnection.State.toString(
+                    stateCopy
+                )}`
+            );
         }
         this.state = undefined;
         this.onConnectionChangedEmitter.fire(this.state);
@@ -215,8 +297,9 @@ export class MonitorConnection {
         if (!this.connected) {
             return Status.NOT_CONNECTED;
         }
-        return new Promise<Status>(resolve => {
-            this.monitorService.send(data + this.monitorModel.lineEnding)
+        return new Promise<Status>((resolve) => {
+            this.monitorService
+                .send(data + this.monitorModel.lineEnding)
                 .then(() => resolve(Status.OK));
         });
     }
@@ -225,18 +308,28 @@ export class MonitorConnection {
         return this.onConnectionChangedEmitter.event;
     }
 
-    get onRead(): Event<MonitorReadEvent> {
+    get onRead(): Event<{ message: string }> {
         return this.onReadEmitter.event;
     }
 
-    protected async handleBoardConfigChange(boardsConfig: BoardsConfig.Config): Promise<void> {
+    protected async handleBoardConfigChange(
+        boardsConfig: BoardsConfig.Config
+    ): Promise<void> {
         if (this.autoConnect) {
-            if (this.boardsServiceProvider.canUploadTo(boardsConfig, { silent: false })) {
+            if (
+                this.boardsServiceProvider.canUploadTo(boardsConfig, {
+                    silent: false,
+                })
+            ) {
                 // Instead of calling `getAttachedBoards` and filtering for `AttachedSerialBoard` we have to check the available ports.
                 // The connected board might be unknown. See: https://github.com/arduino/arduino-pro-ide/issues/127#issuecomment-563251881
-                this.boardsService.getAvailablePorts().then(ports => {
-                    if (ports.some(port => Port.equals(port, boardsConfig.selectedPort))) {
-                        new Promise<void>(resolve => {
+                this.boardsService.getAvailablePorts().then((ports) => {
+                    if (
+                        ports.some((port) =>
+                            Port.equals(port, boardsConfig.selectedPort)
+                        )
+                    ) {
+                        new Promise<void>((resolve) => {
                             // First, disconnect if connected.
                             if (this.connected) {
                                 this.disconnect().then(() => resolve());
@@ -245,7 +338,8 @@ export class MonitorConnection {
                             resolve();
                         }).then(() => {
                             // Then (re-)connect.
-                            const { selectedBoard: board, selectedPort: port } = boardsConfig;
+                            const { selectedBoard: board, selectedPort: port } =
+                                boardsConfig;
                             const { baudRate } = this.monitorModel;
                             this.connect({ board, port, baudRate });
                         });
@@ -254,11 +348,9 @@ export class MonitorConnection {
             }
         }
     }
-
 }
 
 export namespace MonitorConnection {
-
     export interface State {
         readonly config: MonitorConfig;
     }
@@ -270,5 +362,4 @@ export namespace MonitorConnection {
             return `${Board.toString(board)} ${Port.toString(port)}`;
         }
     }
-
 }

arduino-ide-extension/src/browser/monitor/monitor-model.ts

@@ -1,12 +1,14 @@
 import { injectable, inject } from 'inversify';
 import { Emitter, Event } from '@theia/core/lib/common/event';
 import { MonitorConfig } from '../../common/protocol/monitor-service';
-import { FrontendApplicationContribution, LocalStorageService } from '@theia/core/lib/browser';
+import {
+    FrontendApplicationContribution,
+    LocalStorageService,
+} from '@theia/core/lib/browser';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
 
 @injectable()
 export class MonitorModel implements FrontendApplicationContribution {
-
     protected static STORAGE_ID = 'arduino-monitor-model';
 
     @inject(LocalStorageService)
@@ -15,7 +17,9 @@ export class MonitorModel implements FrontendApplicationContribution {
     @inject(BoardsServiceProvider)
     protected readonly boardsServiceClient: BoardsServiceProvider;
 
-    protected readonly onChangeEmitter: Emitter<MonitorModel.State.Change<keyof MonitorModel.State>>;
+    protected readonly onChangeEmitter: Emitter<
+        MonitorModel.State.Change<keyof MonitorModel.State>
+    >;
     protected _autoscroll: boolean;
     protected _timestamp: boolean;
     protected _baudRate: MonitorConfig.BaudRate;
@@ -26,15 +30,19 @@ export class MonitorModel implements FrontendApplicationContribution {
         this._timestamp = false;
         this._baudRate = MonitorConfig.BaudRate.DEFAULT;
         this._lineEnding = MonitorModel.EOL.DEFAULT;
-        this.onChangeEmitter = new Emitter<MonitorModel.State.Change<keyof MonitorModel.State>>();
+        this.onChangeEmitter = new Emitter<
+            MonitorModel.State.Change<keyof MonitorModel.State>
+        >();
     }
 
     onStart(): void {
-        this.localStorageService.getData<MonitorModel.State>(MonitorModel.STORAGE_ID).then(state => {
-            if (state) {
-                this.restoreState(state);
-            }
-        });
+        this.localStorageService
+            .getData<MonitorModel.State>(MonitorModel.STORAGE_ID)
+            .then((state) => {
+                if (state) {
+                    this.restoreState(state);
+                }
+            });
     }
 
     get onChange(): Event<MonitorModel.State.Change<keyof MonitorModel.State>> {
@@ -48,7 +56,12 @@ export class MonitorModel implements FrontendApplicationContribution {
     toggleAutoscroll(): void {
         this._autoscroll = !this._autoscroll;
         this.storeState();
-        this.storeState().then(() => this.onChangeEmitter.fire({ property: 'autoscroll', value: this._autoscroll }));
+        this.storeState().then(() =>
+            this.onChangeEmitter.fire({
+                property: 'autoscroll',
+                value: this._autoscroll,
+            })
+        );
     }
 
     get timestamp(): boolean {
@@ -57,7 +70,12 @@ export class MonitorModel implements FrontendApplicationContribution {
 
     toggleTimestamp(): void {
         this._timestamp = !this._timestamp;
-        this.storeState().then(() => this.onChangeEmitter.fire({ property: 'timestamp', value: this._timestamp }));
+        this.storeState().then(() =>
+            this.onChangeEmitter.fire({
+                property: 'timestamp',
+                value: this._timestamp,
+            })
+        );
     }
 
     get baudRate(): MonitorConfig.BaudRate {
@@ -66,7 +84,12 @@ export class MonitorModel implements FrontendApplicationContribution {
 
     set baudRate(baudRate: MonitorConfig.BaudRate) {
         this._baudRate = baudRate;
-        this.storeState().then(() => this.onChangeEmitter.fire({ property: 'baudRate', value: this._baudRate }));
+        this.storeState().then(() =>
+            this.onChangeEmitter.fire({
+                property: 'baudRate',
+                value: this._baudRate,
+            })
+        );
     }
 
     get lineEnding(): MonitorModel.EOL {
@@ -75,7 +98,12 @@ export class MonitorModel implements FrontendApplicationContribution {
 
     set lineEnding(lineEnding: MonitorModel.EOL) {
         this._lineEnding = lineEnding;
-        this.storeState().then(() => this.onChangeEmitter.fire({ property: 'lineEnding', value: this._lineEnding }));
+        this.storeState().then(() =>
+            this.onChangeEmitter.fire({
+                property: 'lineEnding',
+                value: this._lineEnding,
+            })
+        );
     }
 
     protected restoreState(state: MonitorModel.State): void {
@@ -90,14 +118,12 @@ export class MonitorModel implements FrontendApplicationContribution {
             autoscroll: this._autoscroll,
             timestamp: this._timestamp,
             baudRate: this._baudRate,
-            lineEnding: this._lineEnding
+            lineEnding: this._lineEnding,
         });
     }
-
 }
 
 export namespace MonitorModel {
-
     export interface State {
         autoscroll: boolean;
         timestamp: boolean;
@@ -115,5 +141,4 @@ export namespace MonitorModel {
     export namespace EOL {
         export const DEFAULT: EOL = '\n';
     }
-
 }

arduino-ide-extension/src/browser/monitor/monitor-service-client-impl.ts

@@ -1,23 +1,16 @@
 import { injectable } from 'inversify';
 import { Emitter } from '@theia/core/lib/common/event';
-import { MonitorServiceClient, MonitorReadEvent, MonitorError } from '../../common/protocol/monitor-service';
+import {
+    MonitorServiceClient,
+    MonitorError,
+} from '../../common/protocol/monitor-service';
 
 @injectable()
 export class MonitorServiceClientImpl implements MonitorServiceClient {
-
-    protected readonly onReadEmitter = new Emitter<MonitorReadEvent>();
     protected readonly onErrorEmitter = new Emitter<MonitorError>();
-    readonly onRead = this.onReadEmitter.event;
     readonly onError = this.onErrorEmitter.event;
 
-    notifyRead(event: MonitorReadEvent): void {
-        this.onReadEmitter.fire(event);
-        const { data } = event;
-        console.debug(`Received data: ${data}`);
-    }
-
     notifyError(error: MonitorError): void {
         this.onErrorEmitter.fire(error);
     }
-
 }

arduino-ide-extension/src/browser/monitor/monitor-view-contribution.tsx

@@ -3,7 +3,10 @@ import { injectable, inject } from 'inversify';
 import { AbstractViewContribution } from '@theia/core/lib/browser';
 import { MonitorWidget } from './monitor-widget';
 import { MenuModelRegistry, Command, CommandRegistry } from '@theia/core';
-import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import {
+    TabBarToolbarContribution,
+    TabBarToolbarRegistry,
+} from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import { MonitorModel } from './monitor-model';
 import { ArduinoMenus } from '../menu/arduino-menus';
@@ -12,25 +15,28 @@ export namespace SerialMonitor {
     export namespace Commands {
         export const AUTOSCROLL: Command = {
             id: 'serial-monitor-autoscroll',
-            label: 'Autoscroll'
-        }
+            label: 'Autoscroll',
+        };
         export const TIMESTAMP: Command = {
             id: 'serial-monitor-timestamp',
-            label: 'Timestamp'
-        }
+            label: 'Timestamp',
+        };
         export const CLEAR_OUTPUT: Command = {
             id: 'serial-monitor-clear-output',
             label: 'Clear Output',
-            iconClass: 'clear-all'
-        }
+            iconClass: 'clear-all',
+        };
     }
 }
 
 @injectable()
-export class MonitorViewContribution extends AbstractViewContribution<MonitorWidget> implements TabBarToolbarContribution {
-
+export class MonitorViewContribution
+    extends AbstractViewContribution<MonitorWidget>
+    implements TabBarToolbarContribution
+{
     static readonly TOGGLE_SERIAL_MONITOR = MonitorWidget.ID + ':toggle';
-    static readonly TOGGLE_SERIAL_MONITOR_TOOLBAR = MonitorWidget.ID + ':toggle-toolbar';
+    static readonly TOGGLE_SERIAL_MONITOR_TOOLBAR =
+        MonitorWidget.ID + ':toggle-toolbar';
 
     @inject(MonitorModel) protected readonly model: MonitorModel;
 
@@ -39,11 +45,11 @@ export class MonitorViewContribution extends AbstractViewContribution<MonitorWid
             widgetId: MonitorWidget.ID,
             widgetName: 'Serial Monitor',
             defaultWidgetOptions: {
-                area: 'bottom'
+                area: 'bottom',
             },
             toggleCommandId: MonitorViewContribution.TOGGLE_SERIAL_MONITOR,
-            toggleKeybinding: 'CtrlCmd+Shift+M'
-        })
+            toggleKeybinding: 'CtrlCmd+Shift+M',
+        });
     }
 
     registerMenus(menus: MenuModelRegistry): void {
@@ -51,7 +57,7 @@ export class MonitorViewContribution extends AbstractViewContribution<MonitorWid
             menus.registerMenuAction(ArduinoMenus.TOOLS__MAIN_GROUP, {
                 commandId: this.toggleCommand.id,
                 label: 'Serial Monitor',
-                order: '5'
+                order: '5',
             });
         }
     }
@@ -60,38 +66,44 @@ export class MonitorViewContribution extends AbstractViewContribution<MonitorWid
         registry.registerItem({
             id: 'monitor-autoscroll',
             render: () => this.renderAutoScrollButton(),
-            isVisible: widget => widget instanceof MonitorWidget,
-            onDidChange: this.model.onChange as any // XXX: it's a hack. See: https://github.com/eclipse-theia/theia/pull/6696/
+            isVisible: (widget) => widget instanceof MonitorWidget,
+            onDidChange: this.model.onChange as any, // XXX: it's a hack. See: https://github.com/eclipse-theia/theia/pull/6696/
         });
         registry.registerItem({
             id: 'monitor-timestamp',
             render: () => this.renderTimestampButton(),
-            isVisible: widget => widget instanceof MonitorWidget,
-            onDidChange: this.model.onChange as any // XXX: it's a hack. See: https://github.com/eclipse-theia/theia/pull/6696/
+            isVisible: (widget) => widget instanceof MonitorWidget,
+            onDidChange: this.model.onChange as any, // XXX: it's a hack. See: https://github.com/eclipse-theia/theia/pull/6696/
         });
         registry.registerItem({
             id: SerialMonitor.Commands.CLEAR_OUTPUT.id,
             command: SerialMonitor.Commands.CLEAR_OUTPUT.id,
-            tooltip: 'Clear Output'
+            tooltip: 'Clear Output',
         });
     }
 
     registerCommands(commands: CommandRegistry): void {
         commands.registerCommand(SerialMonitor.Commands.CLEAR_OUTPUT, {
-            isEnabled: widget => widget instanceof MonitorWidget,
-            isVisible: widget => widget instanceof MonitorWidget,
-            execute: widget => {
+            isEnabled: (widget) => widget instanceof MonitorWidget,
+            isVisible: (widget) => widget instanceof MonitorWidget,
+            execute: (widget) => {
                 if (widget instanceof MonitorWidget) {
                     widget.clearConsole();
                 }
-            }
+            },
         });
         if (this.toggleCommand) {
-            commands.registerCommand(this.toggleCommand, { execute: () => this.toggle() });
-            commands.registerCommand({ id: MonitorViewContribution.TOGGLE_SERIAL_MONITOR_TOOLBAR }, {
-                isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'right',
-                execute: () => this.toggle()
+            commands.registerCommand(this.toggleCommand, {
+                execute: () => this.toggle(),
             });
+            commands.registerCommand(
+                { id: MonitorViewContribution.TOGGLE_SERIAL_MONITOR_TOOLBAR },
+                {
+                    isVisible: (widget) =>
+                        ArduinoToolbar.is(widget) && widget.side === 'right',
+                    execute: () => this.toggle(),
+                }
+            );
         }
     }
 
@@ -105,13 +117,17 @@ export class MonitorViewContribution extends AbstractViewContribution<MonitorWid
     }
 
     protected renderAutoScrollButton(): React.ReactNode {
-        return <React.Fragment key='autoscroll-toolbar-item'>
-            <div
-                title='Toggle Autoscroll'
-                className={`item enabled fa fa-angle-double-down arduino-monitor ${this.model.autoscroll ? 'toggled' : ''}`}
-                onClick={this.toggleAutoScroll}
-            ></div>
-        </React.Fragment>;
+        return (
+            <React.Fragment key="autoscroll-toolbar-item">
+                <div
+                    title="Toggle Autoscroll"
+                    className={`item enabled fa fa-angle-double-down arduino-monitor ${
+                        this.model.autoscroll ? 'toggled' : ''
+                    }`}
+                    onClick={this.toggleAutoScroll}
+                ></div>
+            </React.Fragment>
+        );
     }
 
     protected readonly toggleAutoScroll = () => this.doToggleAutoScroll();
@@ -120,18 +136,21 @@ export class MonitorViewContribution extends AbstractViewContribution<MonitorWid
     }
 
     protected renderTimestampButton(): React.ReactNode {
-        return <React.Fragment key='line-ending-toolbar-item'>
-            <div
-                title='Toggle Timestamp'
-                className={`item enabled fa fa-clock-o arduino-monitor ${this.model.timestamp ? 'toggled' : ''}`}
-                onClick={this.toggleTimestamp}
-            ></div>
-        </React.Fragment>;
+        return (
+            <React.Fragment key="line-ending-toolbar-item">
+                <div
+                    title="Toggle Timestamp"
+                    className={`item enabled fa fa-clock-o arduino-monitor ${
+                        this.model.timestamp ? 'toggled' : ''
+                    }`}
+                    onClick={this.toggleTimestamp}
+                ></div>
+            </React.Fragment>
+        );
     }
 
     protected readonly toggleTimestamp = () => this.doToggleTimestamp();
     protected async doToggleTimestamp(): Promise<void> {
         this.model.toggleTimestamp();
     }
-
 }

arduino-ide-extension/src/browser/monitor/monitor-widget.tsx

@@ -5,8 +5,16 @@ import { OptionsType } from 'react-select/src/types';
 import { isOSX } from '@theia/core/lib/common/os';
 import { Event, Emitter } from '@theia/core/lib/common/event';
 import { Key, KeyCode } from '@theia/core/lib/browser/keys';
-import { DisposableCollection, Disposable } from '@theia/core/lib/common/disposable'
-import { ReactWidget, Message, Widget, MessageLoop } from '@theia/core/lib/browser/widgets';
+import {
+    DisposableCollection,
+    Disposable,
+} from '@theia/core/lib/common/disposable';
+import {
+    ReactWidget,
+    Message,
+    Widget,
+    MessageLoop,
+} from '@theia/core/lib/browser/widgets';
 import { Board, Port } from '../../common/protocol/boards-service';
 import { MonitorConfig } from '../../common/protocol/monitor-service';
 import { ArduinoSelect } from '../widgets/arduino-select';
@@ -16,7 +24,6 @@ import { MonitorServiceClientImpl } from './monitor-service-client-impl';
 
 @injectable()
 export class MonitorWidget extends ReactWidget {
-
     static readonly ID = 'serial-monitor';
 
     @inject(MonitorModel)
@@ -49,18 +56,24 @@ export class MonitorWidget extends ReactWidget {
         this.title.closable = true;
         this.scrollOptions = undefined;
         this.toDispose.push(this.clearOutputEmitter);
-        this.toDispose.push(Disposable.create(() => {
-            this.monitorConnection.autoConnect = false;
-            if (this.monitorConnection.connected) {
-                this.monitorConnection.disconnect();
-            }
-        }));
+        this.toDispose.push(
+            Disposable.create(() => {
+                this.monitorConnection.autoConnect = false;
+                if (this.monitorConnection.connected) {
+                    this.monitorConnection.disconnect();
+                }
+            })
+        );
     }
 
     @postConstruct()
     protected init(): void {
         this.update();
-        this.toDispose.push(this.monitorConnection.onConnectionChanged(() => this.clearConsole()));
+        this.toDispose.push(
+            this.monitorConnection.onConnectionChanged(() =>
+                this.clearConsole()
+            )
+        );
     }
 
     clearConsole(): void {
@@ -106,72 +119,93 @@ export class MonitorWidget extends ReactWidget {
             return;
         }
         this.focusNode = element;
-        requestAnimationFrame(() => MessageLoop.sendMessage(this, Widget.Msg.ActivateRequest));
-    }
+        requestAnimationFrame(() =>
+            MessageLoop.sendMessage(this, Widget.Msg.ActivateRequest)
+        );
+    };
 
     protected get lineEndings(): OptionsType<SelectOption<MonitorModel.EOL>> {
         return [
             {
                 label: 'No Line Ending',
-                value: ''
+                value: '',
             },
             {
                 label: 'New Line',
-                value: '\n'
+                value: '\n',
             },
             {
                 label: 'Carriage Return',
-                value: '\r'
+                value: '\r',
             },
             {
                 label: 'Both NL & CR',
-                value: '\r\n'
-            }
+                value: '\r\n',
+            },
         ];
     }
 
-    protected get baudRates(): OptionsType<SelectOption<MonitorConfig.BaudRate>> {
-        const baudRates: Array<MonitorConfig.BaudRate> = [300, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200];
-        return baudRates.map(baudRate => ({ label: baudRate + ' baud', value: baudRate }));
+    protected get baudRates(): OptionsType<
+        SelectOption<MonitorConfig.BaudRate>
+    > {
+        const baudRates: Array<MonitorConfig.BaudRate> = [
+            300, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200,
+        ];
+        return baudRates.map((baudRate) => ({
+            label: baudRate + ' baud',
+            value: baudRate,
+        }));
     }
 
     protected render(): React.ReactNode {
         const { baudRates, lineEndings } = this;
-        const lineEnding = lineEndings.find(item => item.value === this.monitorModel.lineEnding) || lineEndings[1]; // Defaults to `\n`.
-        const baudRate = baudRates.find(item => item.value === this.monitorModel.baudRate) || baudRates[4]; // Defaults to `9600`.
-        return <div className='serial-monitor'>
-            <div className='head'>
-                <div className='send'>
-                    <SerialMonitorSendInput
-                        monitorConfig={this.monitorConnection.monitorConfig}
-                        resolveFocus={this.onFocusResolved}
-                        onSend={this.onSend} />
-                </div>
-                <div className='config'>
-                    <div className='select'>
-                        <ArduinoSelect
-                            maxMenuHeight={this.widgetHeight - 40}
-                            options={lineEndings}
-                            defaultValue={lineEnding}
-                            onChange={this.onChangeLineEnding} />
+        const lineEnding =
+            lineEndings.find(
+                (item) => item.value === this.monitorModel.lineEnding
+            ) || lineEndings[1]; // Defaults to `\n`.
+        const baudRate =
+            baudRates.find(
+                (item) => item.value === this.monitorModel.baudRate
+            ) || baudRates[4]; // Defaults to `9600`.
+        return (
+            <div className="serial-monitor">
+                <div className="head">
+                    <div className="send">
+                        <SerialMonitorSendInput
+                            monitorConfig={this.monitorConnection.monitorConfig}
+                            resolveFocus={this.onFocusResolved}
+                            onSend={this.onSend}
+                        />
                     </div>
-                    <div className='select'>
-                        <ArduinoSelect
-                            className='select'
-                            maxMenuHeight={this.widgetHeight - 40}
-                            options={baudRates}
-                            defaultValue={baudRate}
-                            onChange={this.onChangeBaudRate} />
+                    <div className="config">
+                        <div className="select">
+                            <ArduinoSelect
+                                maxMenuHeight={this.widgetHeight - 40}
+                                options={lineEndings}
+                                defaultValue={lineEnding}
+                                onChange={this.onChangeLineEnding}
+                            />
+                        </div>
+                        <div className="select">
+                            <ArduinoSelect
+                                className="select"
+                                maxMenuHeight={this.widgetHeight - 40}
+                                options={baudRates}
+                                defaultValue={baudRate}
+                                onChange={this.onChangeBaudRate}
+                            />
+                        </div>
                     </div>
                 </div>
+                <div className="body">
+                    <SerialMonitorOutput
+                        monitorModel={this.monitorModel}
+                        monitorConnection={this.monitorConnection}
+                        clearConsoleEvent={this.clearOutputEmitter.event}
+                    />
+                </div>
             </div>
-            <div className='body'>
-                <SerialMonitorOutput
-                    monitorModel={this.monitorModel}
-                    monitorConnection={this.monitorConnection}
-                    clearConsoleEvent={this.clearOutputEmitter.event} />
-            </div>
-        </div>;
+        );
     }
 
     protected readonly onSend = (value: string) => this.doSend(value);
@@ -179,14 +213,17 @@ export class MonitorWidget extends ReactWidget {
         this.monitorConnection.send(value);
     }
 
-    protected readonly onChangeLineEnding = (option: SelectOption<MonitorModel.EOL>) => {
+    protected readonly onChangeLineEnding = (
+        option: SelectOption<MonitorModel.EOL>
+    ) => {
         this.monitorModel.lineEnding = option.value;
-    }
+    };
 
-    protected readonly onChangeBaudRate = (option: SelectOption<MonitorConfig.BaudRate>) => {
+    protected readonly onChangeBaudRate = (
+        option: SelectOption<MonitorConfig.BaudRate>
+    ) => {
         this.monitorModel.baudRate = option.value;
-    }
-
+    };
 }
 
 export namespace SerialMonitorSendInput {
@@ -200,8 +237,10 @@ export namespace SerialMonitorSendInput {
     }
 }
 
-export class SerialMonitorSendInput extends React.Component<SerialMonitorSendInput.Props, SerialMonitorSendInput.State> {
-
+export class SerialMonitorSendInput extends React.Component<
+    SerialMonitorSendInput.Props,
+    SerialMonitorSendInput.State
+> {
     constructor(props: Readonly<SerialMonitorSendInput.Props>) {
         super(props);
         this.state = { text: '' };
@@ -211,30 +250,39 @@ export class SerialMonitorSendInput extends React.Component<SerialMonitorSendInp
     }
 
     render(): React.ReactNode {
-        return <input
-            ref={this.setRef}
-            type='text'
-            className={`theia-input ${this.props.monitorConfig ? '' : 'warning'}`}
-            placeholder={this.placeholder}
-            value={this.state.text}
-            onChange={this.onChange}
-            onKeyDown={this.onKeyDown} />
+        return (
+            <input
+                ref={this.setRef}
+                type="text"
+                className={`theia-input ${
+                    this.props.monitorConfig ? '' : 'warning'
+                }`}
+                placeholder={this.placeholder}
+                value={this.state.text}
+                onChange={this.onChange}
+                onKeyDown={this.onKeyDown}
+            />
+        );
     }
 
     protected get placeholder(): string {
         const { monitorConfig } = this.props;
         if (!monitorConfig) {
-            return 'Not connected. Select a board and a port to connect automatically.'
+            return 'Not connected. Select a board and a port to connect automatically.';
         }
         const { board, port } = monitorConfig;
-        return `Message (${isOSX ? '⌘' : 'Ctrl'}+Enter to send message to '${Board.toString(board, { useFqbn: false })}' on '${Port.toString(port)}')`;
+        return `Message (${
+            isOSX ? '⌘' : 'Ctrl'
+        }+Enter to send message to '${Board.toString(board, {
+            useFqbn: false,
+        })}' on '${Port.toString(port)}')`;
     }
 
     protected setRef = (element: HTMLElement | null) => {
         if (this.props.resolveFocus) {
             this.props.resolveFocus(element || undefined);
         }
-    }
+    };
 
     protected onChange(event: React.ChangeEvent<HTMLInputElement>): void {
         this.setState({ text: event.target.value });
@@ -254,7 +302,6 @@ export class SerialMonitorSendInput extends React.Component<SerialMonitorSendInp
             }
         }
     }
-
 }
 
 export namespace SerialMonitorOutput {
@@ -269,8 +316,10 @@ export namespace SerialMonitorOutput {
     }
 }
 
-export class SerialMonitorOutput extends React.Component<SerialMonitorOutput.Props, SerialMonitorOutput.State> {
-
+export class SerialMonitorOutput extends React.Component<
+    SerialMonitorOutput.Props,
+    SerialMonitorOutput.State
+> {
     /**
      * Do not touch it. It is used to be able to "follow" the serial monitor log.
      */
@@ -279,25 +328,38 @@ export class SerialMonitorOutput extends React.Component<SerialMonitorOutput.Pro
 
     constructor(props: Readonly<SerialMonitorOutput.Props>) {
         super(props);
-        this.state = { content: '', timestamp: this.props.monitorModel.timestamp };
+        this.state = {
+            content: '',
+            timestamp: this.props.monitorModel.timestamp,
+        };
     }
 
     render(): React.ReactNode {
-        return <React.Fragment>
-            <div style={({ whiteSpace: 'pre', fontFamily: 'monospace' })}>
-                {this.state.content}
-            </div>
-            <div style={{ float: 'left', clear: 'both' }} ref={element => { this.anchor = element; }} />
-        </React.Fragment>;
+        return (
+            <React.Fragment>
+                <div style={{ whiteSpace: 'pre', fontFamily: 'monospace' }}>
+                    {this.state.content}
+                </div>
+                <div
+                    style={{ float: 'left', clear: 'both' }}
+                    ref={(element) => {
+                        this.anchor = element;
+                    }}
+                />
+            </React.Fragment>
+        );
     }
 
     componentDidMount(): void {
         this.scrollToBottom();
         this.toDisposeBeforeUnmount.pushAll([
-            this.props.monitorConnection.onRead(({ data }) => {
-                const rawLines = data.split('\n');
-                const lines: string[] = []
-                const timestamp = () => this.state.timestamp ? `${dateFormat(new Date(), 'H:M:ss.l')} -> ` : '';
+            this.props.monitorConnection.onRead(({ message }) => {
+                const rawLines = message.split('\n');
+                const lines: string[] = [];
+                const timestamp = () =>
+                    this.state.timestamp
+                        ? `${dateFormat(new Date(), 'H:M:ss.l')} -> `
+                        : '';
                 for (let i = 0; i < rawLines.length; i++) {
                     if (i === 0 && this.state.content.length !== 0) {
                         lines.push(rawLines[i]);
@@ -314,7 +376,7 @@ export class SerialMonitorOutput extends React.Component<SerialMonitorOutput.Pro
                     const { timestamp } = this.props.monitorModel;
                     this.setState({ timestamp });
                 }
-            })
+            }),
         ]);
     }
 
@@ -332,7 +394,6 @@ export class SerialMonitorOutput extends React.Component<SerialMonitorOutput.Pro
             this.anchor.scrollIntoView();
         }
     }
-
 }
 
 export interface SelectOption<T> {

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

@@ -3,24 +3,48 @@ import { Emitter } from '@theia/core/lib/common/event';
 import { JsonRpcProxy } from '@theia/core/lib/common/messaging/proxy-factory';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
-import { NotificationServiceClient, NotificationServiceServer } from '../common/protocol/notification-service';
-import { AttachedBoardsChangeEvent, BoardsPackage, LibraryPackage, Config } from '../common/protocol';
+import {
+    NotificationServiceClient,
+    NotificationServiceServer,
+} from '../common/protocol/notification-service';
+import {
+    AttachedBoardsChangeEvent,
+    BoardsPackage,
+    LibraryPackage,
+    Config,
+    Sketch,
+} from '../common/protocol';
 
 @injectable()
-export class NotificationCenter implements NotificationServiceClient, FrontendApplicationContribution {
-
+export class NotificationCenter
+    implements NotificationServiceClient, FrontendApplicationContribution
+{
     @inject(NotificationServiceServer)
     protected readonly server: JsonRpcProxy<NotificationServiceServer>;
 
     protected readonly indexUpdatedEmitter = new Emitter<void>();
     protected readonly daemonStartedEmitter = new Emitter<void>();
     protected readonly daemonStoppedEmitter = new Emitter<void>();
-    protected readonly configChangedEmitter = new Emitter<{ config: Config | undefined }>();
-    protected readonly platformInstalledEmitter = new Emitter<{ item: BoardsPackage }>();
-    protected readonly platformUninstalledEmitter = new Emitter<{ item: BoardsPackage }>();
-    protected readonly libraryInstalledEmitter = new Emitter<{ item: LibraryPackage }>();
-    protected readonly libraryUninstalledEmitter = new Emitter<{ item: LibraryPackage }>();
-    protected readonly attachedBoardsChangedEmitter = new Emitter<AttachedBoardsChangeEvent>();
+    protected readonly configChangedEmitter = new Emitter<{
+        config: Config | undefined;
+    }>();
+    protected readonly platformInstalledEmitter = new Emitter<{
+        item: BoardsPackage;
+    }>();
+    protected readonly platformUninstalledEmitter = new Emitter<{
+        item: BoardsPackage;
+    }>();
+    protected readonly libraryInstalledEmitter = new Emitter<{
+        item: LibraryPackage;
+    }>();
+    protected readonly libraryUninstalledEmitter = new Emitter<{
+        item: LibraryPackage;
+    }>();
+    protected readonly attachedBoardsChangedEmitter =
+        new Emitter<AttachedBoardsChangeEvent>();
+    protected readonly recentSketchesChangedEmitter = new Emitter<{
+        sketches: Sketch[];
+    }>();
 
     protected readonly toDispose = new DisposableCollection(
         this.indexUpdatedEmitter,
@@ -43,6 +67,7 @@ export class NotificationCenter implements NotificationServiceClient, FrontendAp
     readonly onLibraryInstalled = this.libraryInstalledEmitter.event;
     readonly onLibraryUninstalled = this.libraryUninstalledEmitter.event;
     readonly onAttachedBoardsChanged = this.attachedBoardsChangedEmitter.event;
+    readonly onRecentSketchesChanged = this.recentSketchesChangedEmitter.event;
 
     @postConstruct()
     protected init(): void {
@@ -89,4 +114,7 @@ export class NotificationCenter implements NotificationServiceClient, FrontendAp
         this.attachedBoardsChangedEmitter.fire(event);
     }
 
+    notifyRecentSketchesChanged(event: { sketches: Sketch[] }): void {
+        this.recentSketchesChangedEmitter.fire(event);
+    }
 }