Fixed sorting of sketches and examples - ignore case

issue #185

.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

@@ -0,0 +1,182 @@
+name: Arduino IDE
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+*'
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - main
+  schedule:
+    - cron: '0 3 * * *' # run every day at 3AM (https://docs.github.com/en/actions/reference/events-that-trigger-workflows#scheduled-events-schedule)
+
+jobs:
+
+  build:
+    if: github.repository == 'arduino/arduino-ide'
+    strategy:
+      matrix:
+        config:
+          - os: windows-latest
+          - os: ubuntu-latest
+          - os: macos-latest
+    runs-on: ${{ matrix.config.os }}
+    timeout-minutes: 90
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install Node.js 12.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: '12.14.1'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install Python 2.7
+        uses: actions/setup-python@v2
+        with:
+          python-version: '2.7'
+
+      - name: Package
+        shell: bash
+        env:
+          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/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 [ $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 }}"
+
+              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 }}"
+              fi
+            fi
+
+            yarn --cwd ./electron/packager/
+            yarn --cwd ./electron/packager/ package
+
+      - name: Upload [GitHub Actions]
+        uses: actions/upload-artifact@v2
+        with:
+          name: build-artifacts
+          path: electron/build/dist/build-artifacts/
+
+  changelog:
+    needs: build
+    runs-on: ubuntu-latest
+    outputs:
+      BODY: ${{ steps.changelog.outputs.BODY }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0 # To fetch all history for all branches and tags.
+
+      - name: Generate Changelog
+        id: changelog
+        env:
+          IS_RELEASE: ${{ startsWith(github.ref, 'refs/tags/') }}
+        run: |
+            export LATEST_TAG=$(git describe --abbrev=0)
+            export GIT_LOG=$(git log --pretty=" - %s [%h]" $LATEST_TAG..HEAD | sed 's/ *$//g')
+            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-ide/releases/tag/$LATEST_TAG)")
+              if [ -z "$GIT_LOG" ]; then
+                  export BODY="There were no changes since version $LATEST_TAG_WITH_LINK."
+              else
+                  export BODY=$(echo -e "Changes since version $LATEST_TAG_WITH_LINK:\n$GIT_LOG")
+              fi
+            fi
+            echo -e "$BODY"
+            OUTPUT_SAFE_BODY="${BODY//'%'/'%25'}"
+            OUTPUT_SAFE_BODY="${OUTPUT_SAFE_BODY//$'\n'/'%0A'}"
+            OUTPUT_SAFE_BODY="${OUTPUT_SAFE_BODY//$'\r'/'%0D'}"
+            echo "::set-output name=BODY::$OUTPUT_SAFE_BODY"
+            echo "$BODY" > CHANGELOG.txt
+
+      - name: Upload Changelog [GitHub Actions]
+        if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main')
+        uses: actions/upload-artifact@v2
+        with:
+          name: build-artifacts
+          path: CHANGELOG.txt
+
+  publish:
+    needs: changelog
+    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: Publish Nightly [S3]
+        uses: docker://plugins/s3
+        env:
+          PLUGIN_SOURCE: "build-artifacts/*"
+          PLUGIN_STRIP_PREFIX: "build-artifacts/"
+          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: 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: Get Tag
+        id: tag_name
+        run: |
+          echo ::set-output name=TAG_NAME::${GITHUB_REF#refs/tags/}
+
+      - name: Publish Release [GitHub]
+        uses: svenstaro/upload-release-action@2.2.0
+        with:
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          release_name: ${{ steps.tag_name.outputs.TAG_NAME }}
+          file: build-artifacts/*
+          tag: ${{ github.ref }}
+          file_glob: true
+          body: ${{ needs.changelog.outputs.BODY }}
+
+      - name: Publish Release [S3]
+        uses: docker://plugins/s3
+        env:
+          PLUGIN_SOURCE: "build-artifacts/*"
+          PLUGIN_STRIP_PREFIX: "build-artifacts/"
+          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 }}

.github/workflows/check-certificates.yml

@@ -0,0 +1,127 @@
+name: Check for issues with signing certificates
+
+on:
+  schedule:
+    # run every 10 hours
+    - cron: "0 */10 * * *"
+  # workflow_dispatch event allows the workflow to be triggered manually.
+  # This could be used to run an immediate check after updating certificate secrets.
+  # See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows#workflow_dispatch
+  workflow_dispatch:
+
+env:
+  # Begin notifications when there are less than this many days remaining before expiration
+  EXPIRATION_WARNING_PERIOD: 30
+
+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:
+      fail-fast: false
+
+      matrix:
+        certificate:
+          - identifier: macOS signing certificate # Text used to identify the certificate in notifications
+            certificate-secret: APPLE_SIGNING_CERTIFICATE_P12  # The name of the secret that contains the certificate
+            password-secret: KEYCHAIN_PASSWORD  # The name of the secret that contains the certificate password
+          - identifier: Windows signing certificate
+            certificate-secret: WINDOWS_SIGNING_CERTIFICATE_PFX
+            password-secret: WINDOWS_SIGNING_CERTIFICATE_PASSWORD
+
+    steps:
+      - name: Set certificate path environment variable
+        run: |
+          # See: https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
+          echo "CERTIFICATE_PATH=${{ runner.temp }}/certificate.p12" >> "$GITHUB_ENV"
+
+      - name: Decode certificate
+        env:
+          CERTIFICATE: ${{ secrets[matrix.certificate.certificate-secret] }}
+        run: |
+          echo "${{ env.CERTIFICATE }}" | base64 --decode > "${{ env.CERTIFICATE_PATH }}"
+
+      - name: Verify certificate
+        env:
+          CERTIFICATE_PASSWORD: ${{ secrets[matrix.certificate.password-secret] }}
+        run: |
+          (
+            openssl pkcs12 \
+              -in "${{ env.CERTIFICATE_PATH }}" \
+              -noout -passin env:CERTIFICATE_PASSWORD
+          ) || (
+            echo "::error::Verification of ${{ matrix.certificate.identifier }} failed!!!"
+            exit 1
+          )
+
+      # See: https://github.com/rtCamp/action-slack-notify
+      - name: Slack notification of certificate verification failure
+        if: failure()
+        uses: rtCamp/action-slack-notify@v2.1.0
+        env:
+          SLACK_WEBHOOK: ${{ secrets.TEAM_TOOLING_CHANNEL_SLACK_WEBHOOK }}
+          SLACK_MESSAGE: |
+            :warning::warning::warning::warning:
+            WARNING: ${{ github.repository }} ${{ matrix.certificate.identifier }} verification failed!!!
+            :warning::warning::warning::warning:
+          SLACK_COLOR: danger
+          MSG_MINIMAL: true
+
+      - name: Get days remaining before certificate expiration date
+        env:
+          CERTIFICATE_PASSWORD: ${{ secrets[matrix.certificate.password-secret] }}
+        id: get-days-before-expiration
+        run: |
+          EXPIRATION_DATE="$(
+            (
+              openssl pkcs12 \
+                -in "${{ env.CERTIFICATE_PATH }}" \
+                -clcerts \
+                -nodes \
+                -passin env:CERTIFICATE_PASSWORD
+            ) | (
+              openssl x509 \
+                -noout \
+                -enddate
+            ) | (
+              grep \
+                --max-count=1 \
+                --only-matching \
+                --perl-regexp \
+                'notAfter=(\K.*)'
+            )
+          )"
+
+          DAYS_BEFORE_EXPIRATION="$((($(date --utc --date="$EXPIRATION_DATE" +%s) - $(date --utc +%s)) / 60 / 60 / 24))"
+
+          # Display the expiration information in the log
+          echo "Certificate expiration date: $EXPIRATION_DATE"
+          echo "Days remaining before expiration: $DAYS_BEFORE_EXPIRATION"
+
+          echo "::set-output name=days::$DAYS_BEFORE_EXPIRATION"
+
+      - name: Check if expiration notification period has been reached
+        id: check-expiration
+        run: |
+          if [[ ${{ steps.get-days-before-expiration.outputs.days }} -lt ${{ env.EXPIRATION_WARNING_PERIOD }} ]]; then
+            echo "::error::${{ matrix.certificate.identifier }} will expire in ${{ steps.get-days-before-expiration.outputs.days }} days!!!"
+            exit 1
+          fi
+
+      - name: Slack notification of pending certificate expiration
+        # Don't send spurious expiration notification if verification fails
+        if: failure() && steps.check-expiration.outcome == 'failure'
+        uses: rtCamp/action-slack-notify@v2.1.0
+        env:
+          SLACK_WEBHOOK: ${{ secrets.TEAM_TOOLING_CHANNEL_SLACK_WEBHOOK }}
+          SLACK_MESSAGE: |
+            :warning::warning::warning::warning:
+            WARNING: ${{ github.repository }} ${{ matrix.certificate.identifier }} will expire in ${{ steps.get-days-before-expiration.outputs.days }} days!!!
+            :warning::warning::warning::warning:
+          SLACK_COLOR: danger
+          MSG_MINIMAL: true

.gitignore

@@ -2,13 +2,17 @@ node_modules/
 # .node_modules is a hack for the electron builder.
 .node_modules/
 lib/
-build/
 downloads/
+build/
+Examples/
 !electron/build/
 src-gen/
-browser-app/webpack.config.js
-electron-app/webpack.config.js
+*webpack.config.js
 .DS_Store
-/workspace/static
 # switching from `electron` to `browser` in dev mode.
 .browser_modules
+yarn*.log
+# For the VS Code extensions used by Theia.
+plugins
+# the config files for the CLI
+arduino-ide-extension/data/cli/config

.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

.vscode/launch.json

@@ -4,6 +4,19 @@
   // 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",
@@ -23,7 +36,8 @@
         "--hostname=localhost",
         "--no-cluster",
         "--remote-debugging-port=9222",
-        "--no-app-auto-install"
+        "--no-app-auto-install",
+        "--plugins=local-dir:plugins"
       ],
       "env": {
         "NODE_ENV": "development"
@@ -33,7 +47,7 @@
         "${workspaceRoot}/electron-app/src-gen/backend/*.js",
         "${workspaceRoot}/electron-app/src-gen/frontend/*.js",
         "${workspaceRoot}/electron-app/lib/**/*.js",
-        "${workspaceRoot}/arduino-ide-extension/*/lib/**/*.js"
+        "${workspaceRoot}/arduino-ide-extension/lib/**/*.js"
       ],
       "smartStep": true,
       "internalConsoleOptions": "openOnSessionStart",
@@ -48,7 +62,8 @@
         "--hostname=0.0.0.0",
         "--port=3000",
         "--no-cluster",
-        "--no-app-auto-install"
+        "--no-app-auto-install",
+        "--plugins=local-dir:plugins"
       ],
       "windows": {
         "env": {
@@ -63,7 +78,7 @@
       "outFiles": [
         "${workspaceRoot}/browser-app/src-gen/backend/*.js",
         "${workspaceRoot}/browser-app/lib/**/*.js",
-        "${workspaceRoot}/arduino-ide-extension/*/lib/**/*.js"
+        "${workspaceRoot}/arduino-ide-extension/lib/**/*.js"
       ],
       "smartStep": true,
       "internalConsoleOptions": "openOnSessionStart",
@@ -72,34 +87,23 @@
     {
       "type": "node",
       "request": "launch",
-      "name": "App (Browser - Debug CLI daemon)",
-      "program": "${workspaceRoot}/browser-app/src-gen/backend/main.js",
+      "protocol": "inspector",
+      "name": "Run Test [current]",
+      "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
       "args": [
-        "--hostname=0.0.0.0",
-        "--port=3000",
-        "--no-cluster",
-        "--no-app-auto-install",
-        "--debug-cli=true"
+        "--require",
+        "reflect-metadata/Reflect",
+        "--no-timeouts",
+        "--colors",
+        "**/${fileBasenameNoExtension}.js"
       ],
       "env": {
-        "NODE_ENV": "development"
+        "TS_NODE_PROJECT": "${workspaceRoot}/tsconfig.json"
       },
       "sourceMaps": true,
-      "outFiles": [
-        "${workspaceRoot}/browser-app/src-gen/backend/*.js",
-        "${workspaceRoot}/browser-app/lib/**/*.js",
-        "${workspaceRoot}/arduino-ide-extension/*/lib/**/*.js"
-      ],
       "smartStep": true,
       "internalConsoleOptions": "openOnSessionStart",
       "outputCapture": "std"
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Packager",
-      "program": "${workspaceRoot}/electron/packager/index.js",
-      "cwd": "${workspaceFolder}/electron/packager"
     }
   ]
 }

.vscode/tasks.json

@@ -1,48 +1,78 @@
 {
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "Arduino Editor - Start Browser Example",
-            "type": "shell",
-            "command": "yarn --cwd ./browser-app start",
-            "group": "build",
-            "presentation": {
-                "reveal": "always",
-                "panel": "new",
-                "clear": true
-            }
-        },
-        {
-            "label": "Arduino Editor - Watch Theia Extension",
-            "type": "shell",
-            "command": "yarn --cwd ./arduino-ide-extension watch",
-            "group": "build",
-            "presentation": {
-                "reveal": "always",
-                "panel": "new",
-                "clear": false
-            }
-        },
-        {
-            "label": "Arduino Editor - Watch Browser Example",
-            "type": "shell",
-            "command": "yarn --cwd ./browser-app watch",
-            "group": "build",
-            "presentation": {
-                "reveal": "always",
-                "panel": "new",
-                "clear": false
-            }
-        },
-        {
-            "label": "Arduino Editor - Watch All",
-            "type": "shell",
-            "dependsOn": [
-                "Arduino Editor - Watch Theia Extension",
-                "Arduino Editor - Watch Browser Example"
-            ]
-        }
-    ]
-}
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Arduino IDE - Rebuild Electron App",
+      "type": "shell",
+      "command": "yarn rebuild:browser && yarn rebuild:electron",
+      "group": "build",
+      "presentation": {
+        "reveal": "always",
+        "panel": "new",
+        "clear": false
+      }
+    },
+    {
+      "label": "Arduino IDE - Start Browser App",
+      "type": "shell",
+      "command": "yarn --cwd ./browser-app start",
+      "group": "build",
+      "presentation": {
+        "reveal": "always",
+        "panel": "new",
+        "clear": true
+      }
+    },
+    {
+      "label": "Arduino IDE - Watch IDE Extension",
+      "type": "shell",
+      "command": "yarn --cwd ./arduino-ide-extension watch",
+      "group": "build",
+      "presentation": {
+        "reveal": "always",
+        "panel": "new",
+        "clear": false
+      }
+    }
+    {
+      "label": "Arduino IDE - Watch Browser App",
+      "type": "shell",
+      "command": "yarn --cwd ./browser-app watch",
+      "group": "build",
+      "presentation": {
+        "reveal": "always",
+        "panel": "new",
+        "clear": false
+      }
+    },
+    {
+      "label": "Arduino IDE - Watch Electron App",
+      "type": "shell",
+      "command": "yarn --cwd ./electron-app watch",
+      "group": "build",
+      "presentation": {
+        "reveal": "always",
+        "panel": "new",
+        "clear": false
+      }
+    },
+    {
+      "label": "Arduino IDE - Watch All [Browser]",
+      "type": "shell",
+      "dependsOn": [
+        "Arduino IDE - Watch IDE Extension",
+        "Arduino IDE - Watch Browser App"
+      ]
+    },
+    {
+      "label": "Arduino IDE - Watch All [Electron]",
+      "type": "shell",
+      "dependsOn": [
+        "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 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 `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`.
+

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,50 +1,77 @@
-# Arduino Pro IDE
+<img src="https://content.arduino.cc/website/Arduino_logo_teal.svg" height="100" align="right" />
 
-[![Build Status](https://dev.azure.com/typefox/Arduino/_apis/build/status/bcmi-labs.arduino-editor?branchName=master)](https://dev.azure.com/typefox/Arduino/_build/latest?definitionId=4&branchName=master)
+# Arduino IDE 2.x (beta)
 
-> **Beware:** This is very much work-in-progress. Things can and probably will be broken, even on master.
+[![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)
 
-This repo contains a proof-of-concept for an Arduino IDE based on Theia.
-It's built on top of a [fork of the arduino-cli](https://github.com/typefox/arduino-cli/tree/daemon) that sports a gRPC interface.
+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.
 
-## How to try (offline)
+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.
 
-### Prerequisites
-You should be able to build Theia locally. The requirements are defined [here](https://github.com/theia-ide/theia/blob/master/doc/Developing.md#prerequisites).
+> ⚠️ This is **beta** software. Help us test it!
 
-```
-git clone https://github.com/bcmi-labs/arduino-editor
-cd arduino-editor
-yarn
-yarn rebuild:electron
-yarn --cwd electron-app start
-```
+![](static/screenshot.png)
 
-If you want to switch back to the browser-based example, execute the following in the repository root
-```
-yarn rebuild:browser
-```
-Then you can start the browser example again:
-```
-yarn --cwd browser-app start
-```
+## Download
 
-Click [here](./arduino-ide-extension/README.md) for more details on various IDE services, and the Arduino Pro IDE implementation in general.
+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
 
+These builds are generated every day at 03:00 GMT from the `main` branch and
+should be considered unstable:
 
-## Arduino Pro IDE Electron Application
-The project is built on [Azure DevOps](https://dev.azure.com/typefox/Arduino).
+Platform  | 32 bit                   | 64 bit                                                                                                 |
+--------- | ------------------------ | ------------------------------------------------------------------------------------------------------ |
+Linux     |                          | [Nightly Linux 64 bit]                                                                                 |
+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]                                                                                 |
 
-Currently, we provide the Arduino Pro IDE for the following platforms:
- - Windows,
- - macOS, and
- - Linux.
-   
-You can download the latest release applications fom [here](https://github.com/bcmi-labs/arduino-editor/releases/latest).
-If you want to get a nightly build, go to the [Azure DevOps page](https://dev.azure.com/typefox/Arduino/_build?definitionId=4),
-and follow the steps from below.
+[🚧 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
 
-<img width="500" src="static/download_01.gif">
-<img width="500" src="static/download_02.gif">
+> 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`)
 
-Click [here](./electron/README.md) for more details on the CI/CD, the GitHub release, and the build process in general.
+## Support
+
+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).
+
+## Bugs & Issues
+
+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:
+
+* 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.
+
+### Security
+
+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!
+
+e-mail contact: security@arduino.cc
+
+## Contributions and development
+
+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.
+
+This repository contains the main code, but two more repositories are included during the build process:
+
+* [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
+
+See the [BUILDING.md](BUILDING.md) for a technical overview of the application and instructions for building the code.
+## Donations
+
+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.
+
+## License
+
+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-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
 
@@ -50,3 +50,7 @@ The Config Service knows about your system, like for example the default sketch
 - [src/node/config-service-impl.ts](./src/node/config-service-impl.ts) implements the service backend:
   - getting the `arduino-cli` version and configuration
   - checking whether a file is in a data or sketch directory
+
+### `"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.

arduino-ide-extension/package.json

@@ -1,84 +1,127 @@
 {
   "name": "arduino-ide-extension",
-  "version": "0.0.3",
+  "version": "2.0.0-beta.4",
   "description": "An extension for Theia building the Arduino IDE",
-  "license": "MIT",
-  "engines": {
-    "node": ">=10.10.0"
+  "license": "AGPL-3.0-or-later",
+  "scripts": {
+    "prepare": "yarn download-cli && yarn download-ls && yarn clean && yarn download-examples && yarn build",
+    "clean": "rimraf lib",
+    "download-cli": "node ./scripts/download-cli.js",
+    "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",
+    "build": "tsc && ncp ./src/node/cli-protocol/ ./lib/node/cli-protocol/ && yarn lint",
+    "watch": "tsc -w",
+    "test": "mocha \"./lib/test/**/*.test.js\"",
+    "test:watch": "mocha --watch --watch-files lib \"./lib/test/**/*.test.js\""
   },
   "dependencies": {
-    "@grpc/grpc-js": "^0.6.12",
+    "@grpc/grpc-js": "^1.1.1",
     "@theia/application-package": "next",
     "@theia/core": "next",
-    "@theia/cpp": "next",
     "@theia/editor": "next",
     "@theia/filesystem": "next",
     "@theia/git": "next",
-    "@theia/languages": "next",
     "@theia/markers": "next",
     "@theia/monaco": "next",
     "@theia/navigator": "next",
     "@theia/outline-view": "next",
+    "@theia/preferences": "next",
+    "@theia/output": "next",
     "@theia/search-in-workspace": "next",
     "@theia/terminal": "next",
     "@theia/workspace": "next",
-    "@types/google-protobuf": "^3.7.1",
     "@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/lodash.debounce": "^4.0.6",
+    "@types/ncp": "^2.0.4",
     "@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",
     "css-element-queries": "^1.2.0",
     "dateformat": "^3.0.3",
-    "google-protobuf": "^3.11.0",
+    "deepmerge": "^4.2.2",
+    "fuzzy": "^0.1.3",
+    "glob": "^7.1.6",
+    "google-protobuf": "^3.11.4",
+    "lodash.debounce": "^4.0.8",
+    "js-yaml": "^3.13.1",
+    "ncp": "^2.0.0",
     "p-queue": "^5.0.0",
     "ps-tree": "^1.2.0",
+    "react-disable": "^0.1.0",
     "react-select": "^3.0.4",
-    "semver": "^6.3.0",
+    "react-tabs": "^3.1.2",
+    "semver": "^7.3.2",
     "string-natural-compare": "^2.0.3",
+    "temp": "^0.9.1",
     "tree-kill": "^1.2.1",
     "upath": "^1.1.2",
     "which": "^1.3.1"
   },
-  "scripts": {
-    "prepare": "yarn download-cli && yarn download-ls && yarn run clean && yarn run build",
-    "clean": "rimraf lib",
-    "download-cli": "node ./scripts/download-cli.js",
-    "download-ls": "node ./scripts/download-ls.js",
-    "generate-protocol": "node ./scripts/generate-protocol.js",
-    "lint": "tslint -c ./tslint.json --project ./tsconfig.json",
-    "build": "tsc && ncp ./src/node/cli-protocol/ ./lib/node/cli-protocol/ && yarn lint",
-    "watch": "tsc -w"
-  },
   "devDependencies": {
+    "@types/chai": "^4.2.7",
+    "@types/chai-string": "^1.4.2",
+    "@types/mocha": "^5.2.7",
+    "chai": "^4.2.0",
+    "chai-string": "^1.5.0",
     "decompress": "^4.2.0",
     "decompress-targz": "^4.1.1",
     "decompress-unzip": "^4.0.1",
     "download": "^7.1.0",
-    "grpc-tools": "^1.8.0",
-    "grpc_tools_node_protoc_ts": "^2.5.8",
+    "grpc_tools_node_protoc_ts": "^4.1.0",
+    "mocha": "^7.0.0",
     "moment": "^2.24.0",
-    "ncp": "^2.0.0",
-    "rimraf": "^2.6.1",
+    "protoc": "^1.0.4",
     "shelljs": "^0.8.3",
-    "tslint": "^5.5.0",
-    "typescript": "3.5.3",
+    "sinon": "^9.0.1",
     "uuid": "^3.2.1",
     "yargs": "^11.1.0"
   },
+  "optionalDependencies": {
+    "grpc-tools": "^1.9.0"
+  },
+  "mocha": {
+    "require": [
+      "reflect-metadata/Reflect"
+    ],
+    "reporter": "spec",
+    "colors": true,
+    "watch-extensions": "js",
+    "timeout": 10000
+  },
   "files": [
     "lib",
     "src",
     "build",
-    "data"
+    "data",
+    "examples"
   ],
   "theiaExtensions": [
     {
-      "backend": "lib/node/arduino-backend-module",
-      "frontend": "lib/browser/arduino-frontend-module"
+      "backend": "lib/node/arduino-ide-backend-module",
+      "frontend": "lib/browser/arduino-ide-frontend-module"
     },
     {
-      "frontend": "lib/browser/menu/browser-arduino-menu-module",
-      "frontendElectron": "lib/electron-browser/electron-arduino-menu-module"
+      "frontend": "lib/browser/theia/core/browser-menu-module",
+      "frontendElectron": "lib/electron-browser/theia/core/electron-menu-module"
+    },
+    {
+      "electronMain": "lib/electron-main/arduino-electron-main-module"
     }
-  ]
+  ],
+  "arduino": {
+    "cli": {
+      "version": "0.17.0"
+    }
+  }
 }

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

@@ -1,62 +1,141 @@
 // @ts-check
-// The links to the downloads as of today (02.09.) are the followings:
-// In order to get the latest nightly build for your platform use the following links replacing <DATE> with the current date, using the format YYYYMMDD (i.e for 2019/Aug/06 use 20190806 )
-// Linux 64 bit: https://downloads.arduino.cc/arduino-cli/nightly/arduino-cli_nightly-<DATE>_Linux_64bit.tar.gz
-// Linux ARM 64 bit: https://downloads.arduino.cc/arduino-cli/nightly/arduino-cli_nightly-<DATE>_Linux_ARM64.tar.gz
-// Windows 64 bit: https://downloads.arduino.cc/arduino-cli/nightly/arduino-cli_nightly-<DATE>_Windows_64bit.zip
-// Mac OSX: https://downloads.arduino.cc/arduino-cli/nightly/arduino-cli_nightly-<DATE>_macOS_64bit.tar.gz
-// [...]
-// 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 
 
-(() => {
+(async () => {
 
-    const DEFAULT_VERSION = 'latest'; // require('moment')().format('YYYYMMDD');
-
-    const os = require('os');
+    const fs = require('fs');
     const path = require('path');
+    const temp = require('temp');
     const shell = require('shelljs');
+    const semver = require('semver');
+    const moment = require('moment');
     const downloader = require('./downloader');
 
-    const yargs = require('yargs')
-        .option('cli-version', {
-            alias: 'cv',
-            default: DEFAULT_VERSION,
-            describe: `The version of the 'arduino-cli' to download with the YYYYMMDD format, or 'latest'. Defaults to ${DEFAULT_VERSION}.`
-        })
-        .option('force-download', {
-            alias: 'fd',
-            default: false,
-            describe: `If set, this script force downloads the 'arduino-cli' even if it already exists on the file system.`
-        })
-        .version(false).parse();
-
-    const version = yargs['cli-version'];
-    const force = yargs['force-download'];
-    const { platform, arch } = process;
-
-    const build = path.join(__dirname, '..', 'build');
-    const cli = path.join(build, `arduino-cli${os.platform() === 'win32' ? '.exe' : ''}`);
-
-    const suffix = (() => {
-        switch (platform) {
-            case 'darwin': return 'macOS_64bit.tar.gz';
-            case 'win32': return 'Windows_64bit.zip';
-            case 'linux': {
-                switch (arch) {
-                    case 'arm64': return 'Linux_ARM64.tar.gz';
-                    case 'x64': return 'Linux_64bit.tar.gz';
-                    default: return undefined;
-                }
-            }
-            default: return undefined;
+    const version = (() => {
+        const pkg = require(path.join(__dirname, '..', 'package.json'));
+        if (!pkg) {
+            return undefined;
         }
+
+        const { arduino } = pkg;
+        if (!arduino) {
+            return undefined;
+        }
+
+        const { cli } = arduino;
+        if (!cli) {
+            return undefined;
+        }
+
+        const { version } = cli;
+        return version;
     })();
-    if (!suffix) {
-        shell.echo(`The CLI is not available for ${platform} ${arch}.`);
+
+    if (!version) {
+        shell.echo(`Could not retrieve CLI version info from the 'package.json'.`);
         shell.exit(1);
     }
 
-    const url = `https://downloads.arduino.cc/arduino-cli/nightly/arduino-cli_nightly-${version}_${suffix}`;
-    downloader.download(url, cli, 'arduino-cli', force);
+    const { platform, arch } = process;
+    const buildFolder = path.join(__dirname, '..', 'build');
+    const cliName = `arduino-cli${platform === 'win32' ? '.exe' : ''}`;
+    const destinationPath = path.join(buildFolder, cliName);
 
-})();
+    if (typeof version === 'string') {
+        const suffix = (() => {
+            switch (platform) {
+                case 'darwin': return 'macOS_64bit.tar.gz';
+                case 'win32': return 'Windows_64bit.zip';
+                case 'linux': {
+                    switch (arch) {
+                        case 'arm': return 'Linux_ARMv7.tar.gz';
+                        case 'arm64': return 'Linux_ARM64.tar.gz';
+                        case 'x64': return 'Linux_64bit.tar.gz';
+                        default: return undefined;
+                    }
+                }
+                default: return undefined;
+            }
+        })();
+        if (!suffix) {
+            shell.echo(`The CLI is not available for ${platform} ${arch}.`);
+            shell.exit(1);
+        }
+        if (semver.valid(version)) {
+            const url = `https://downloads.arduino.cc/arduino-cli/arduino-cli_${version}_${suffix}`;
+            shell.echo(`📦  Identified released version of the CLI. Downloading version ${version} from '${url}'`);
+            await downloader.downloadUnzipFile(url, destinationPath, 'arduino-cli');
+        } else if (moment(version, 'YYYYMMDD', true).isValid()) {
+            const url = `https://downloads.arduino.cc/arduino-cli/nightly/arduino-cli_nightly-${version}_${suffix}`;
+            shell.echo(`🌙  Identified nightly version of the CLI. Downloading version ${version} from '${url}'`);
+            await downloader.downloadUnzipFile(url, destinationPath, 'arduino-cli');
+        } else {
+            shell.echo(`🔥  Could not interpret 'version': ${version}`);
+            shell.exit(1);
+        }
+    } else {
+
+        // We assume an object with `owner`, `repo`, commitish?` properties.
+        const { owner, repo, commitish } = version;
+        if (!owner) {
+            shell.echo(`Could not retrieve 'owner' from ${JSON.stringify(version)}`);
+            shell.exit(1);
+        }
+        if (!repo) {
+            shell.echo(`Could not retrieve 'repo' from ${JSON.stringify(version)}`);
+            shell.exit(1);
+        }
+        const url = `https://github.com/${owner}/${repo}.git`;
+        shell.echo(`Building CLI from ${url}. Commitish: ${commitish ? commitish : 'HEAD'}`);
+
+        if (fs.existsSync(destinationPath)) {
+            shell.echo(`Skipping the CLI build because it already exists: ${destinationPath}`);
+            return;
+        }
+
+        if (shell.mkdir('-p', buildFolder).code !== 0) {
+            shell.echo('Could not create build folder.');
+            shell.exit(1);
+        }
+
+        const tempRepoPath = temp.mkdirSync();
+        shell.echo(`>>> Cloning CLI source to ${tempRepoPath}...`);
+        if (shell.exec(`git clone ${url} ${tempRepoPath}`).code !== 0) {
+            shell.exit(1);
+        }
+        shell.echo('<<< Cloned CLI repo.')
+
+        if (commitish) {
+            shell.echo(`>>> Checking out ${commitish}...`);
+            if (shell.exec(`git -C ${tempRepoPath} checkout ${commitish}`).code !== 0) {
+                shell.exit(1);
+            }
+            shell.echo(`<<< Checked out ${commitish}.`);
+        }
+
+        shell.echo(`>>> Building the CLI...`);
+        if (shell.exec('go build', { cwd: tempRepoPath }).code !== 0) {
+            shell.exit(1);
+        }
+        shell.echo('<<< CLI build done.')
+
+        if (!fs.existsSync(path.join(tempRepoPath, cliName))) {
+            shell.echo(`Could not find the CLI at ${path.join(tempRepoPath, cliName)}.`);
+            shell.exit(1);
+        }
+
+        const builtCliPath = path.join(tempRepoPath, cliName);
+        shell.echo(`>>> Copying CLI from ${builtCliPath} to ${destinationPath}...`);
+        if (shell.cp(builtCliPath, destinationPath).code !== 0) {
+            shell.exit(1);
+        }
+        shell.echo(`<<< Copied the CLI.`);
+
+        shell.echo('<<< Verifying CLI...');
+        if (!fs.existsSync(destinationPath)) {
+            shell.exit(1);
+        }
+        shell.echo('>>> Verified CLI.');
+
+    }
+
+})();

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

@@ -0,0 +1,33 @@
+// @ts-check
+
+// The version to use.
+const version = '1.9.0';
+
+(async () => {
+
+    const os = require('os');
+    const path = require('path');
+    const shell = require('shelljs');
+    const { v4 } = require('uuid');
+
+    const repository = path.join(os.tmpdir(), `${v4()}-arduino-examples`);
+    if (shell.mkdir('-p', repository).code !== 0) {
+        shell.exit(1);
+        process.exit(1);
+    }
+
+    if (shell.exec(`git clone https://github.com/arduino/arduino-examples.git ${repository}`).code !== 0) {
+        shell.exit(1);
+        process.exit(1);
+    }
+
+    if (shell.exec(`git -C ${repository} checkout tags/${version} -b ${version}`).code !== 0) {
+        shell.exit(1);
+        process.exit(1);
+    }
+
+    const destination = path.join(__dirname, '..', 'Examples');
+    shell.mkdir('-p', destination);
+    shell.cp('-fR', path.join(repository, 'examples', '*'), destination);
+
+})();

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

@@ -6,9 +6,8 @@
 (() => {
 
     const DEFAULT_ALS_VERSION = 'nightly';
-    const DEFAULT_CLANGD_VERSION = '8.0.1';
+    const DEFAULT_CLANGD_VERSION = 'snapshot_20210124';
 
-    const os = require('os');
     const path = require('path');
     const shell = require('shelljs');
     const downloader = require('./downloader');
@@ -23,7 +22,7 @@
         .option('clangd-version', {
             alias: 'cv',
             default: DEFAULT_CLANGD_VERSION,
-            choices: ['8.0.1'],
+            choices: ['snapshot_20210124'],
             describe: `The version of 'clangd' to download. Defaults to ${DEFAULT_CLANGD_VERSION}.`
         })
         .option('force-download', {
@@ -39,34 +38,35 @@
     const { platform, arch } = process;
 
     const build = path.join(__dirname, '..', 'build');
-    const als = path.join(build, `arduino-language-server${os.platform() === 'win32' ? '.exe' : ''}`);
-    const clangd = path.join(build, `clangd${os.platform() === 'win32' ? '.exe' : ''}`);
+    const lsExecutablePath = path.join(build, `arduino-language-server${platform === 'win32' ? '.exe' : ''}`);
 
-    let alsSuffix, clangdSuffix;
+    let clangdExecutablePath, lsSuffix, clangdPrefix;
     switch (platform) {
         case 'darwin':
-            alsSuffix = 'Darwin_amd64.zip';
-            clangdSuffix = 'macos.zip';
-            break;
-        case 'win32':
-            alsSuffix = 'Windows_NT_amd64.zip';
-            clangdSuffix = 'windows.zip';
+            clangdExecutablePath = path.join(build, 'bin', 'clangd')
+            lsSuffix = 'macOS_amd64.zip';
+            clangdPrefix = 'mac';
             break;
         case 'linux':
-            alsSuffix = 'Linux_amd64.zip';
+            clangdExecutablePath = path.join(build, 'bin', 'clangd')
+            lsSuffix = 'Linux_amd64.zip';
+            clangdPrefix = 'linux'
+            break;
+        case 'win32':
+            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.download(alsUrl, als, 'arduino-language-server', 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);
 
-    if (clangdSuffix) {
-        const clangdUrl = `https://downloads.arduino.cc/arduino-language-server/clangd/clangd_${clangdVersion}_${clangdSuffix}`;
-        downloader.download(clangdUrl, clangd, 'clangd', 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

@@ -17,9 +17,13 @@ process.on('uncaughtException', error => {
     throw error;
 });
 
-exports.download = async (url, targetFile, filePrefix, force) => {
-    const { platform, arch } = process;
-
+/**
+ * @param url {string}        Download URL
+ * @param targetFile {string} Path to the file to copy from the decompressed archive
+ * @param filePrefix {string} Prefix of the file name found in the archive
+ * @param force {boolean}     Whether to download even if the target file exists. `false` by default.
+ */
+exports.downloadUnzipFile = async (url, targetFile, filePrefix, force = false) => {
     if (fs.existsSync(targetFile) && !force) {
         shell.echo(`Skipping download because file already exists: ${targetFile}`);
         return;
@@ -65,7 +69,52 @@ exports.download = async (url, targetFile, filePrefix, force) => {
     if (!fs.existsSync(targetFile)) {
         shell.echo(`Could not find file: ${targetFile}`);
         shell.exit(1);
-    } else {
-        shell.echo(`Done: ${targetFile}`);
     }
+    shell.echo(`Done: ${targetFile}`);
+}
+
+/**
+ * @param url {string}        Download URL
+ * @param targetDir {string}  Directory into which to decompress the archive
+ * @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, decompressOptions = undefined) => {
+    if (fs.existsSync(targetFile) && !force) {
+        shell.echo(`Skipping download because file already exists: ${targetFile}`);
+        return;
+    }
+    if (!fs.existsSync(targetDir)) {
+        if (shell.mkdir('-p', targetDir).code !== 0) {
+            shell.echo('Could not create new directory.');
+            shell.exit(1);
+        }
+    }
+
+    shell.echo(`>>> Downloading from '${url}'...`);
+    const data = await download(url);
+    shell.echo(`<<< Download succeeded.`);
+
+    shell.echo('>>> Decompressing...');
+    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);
+    }
+    shell.echo('<<< Decompressing succeeded.');
+
+    if (!fs.existsSync(targetFile)) {
+        shell.echo(`Could not find file: ${targetFile}`);
+        shell.exit(1);
+    }
+    shell.echo(`Done: ${targetFile}`);
 }

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

@@ -2,80 +2,155 @@
 
 (async () => {
 
-    const DEFAULT_VERSION = 'nightly'; // '0.3.7-alpha.preview';
-
     const os = require('os');
     const path = require('path');
+    const glob = require('glob');
     const { v4 } = require('uuid');
     const shell = require('shelljs');
+    const protoc = path.dirname(require('protoc/protoc'));
+    shell.env.PATH = `${shell.env.PATH}${path.delimiter}${protoc}`;
     shell.env.PATH = `${shell.env.PATH}${path.delimiter}${path.join(__dirname, '..', 'node_modules', '.bin')}`;
-    const yargs = require('yargs')
-        .option('cli-version', {
-            alias: 'cv',
-            default: DEFAULT_VERSION,
-            choices: [
-                // 'latest', // TODO: How do we get the source for `latest`. Currently, `latest` is the `0.3.7-alpha.preview`.
-                'nightly'
-            ],
-            describe: `The version of the 'arduino-cli' to download. Specify either an existing version or use 'nightly'. Defaults to ${DEFAULT_VERSION}.`
-        })
-        .version(false).parse();
 
-    const version = yargs['cli-version'];
-    if (version !== 'nightly') {
-        shell.echo(`Only 'nightly' version is supported.`);
-        shell.exit(1);
-    }
     const repository = path.join(os.tmpdir(), `${v4()}-arduino-cli`);
     if (shell.mkdir('-p', repository).code !== 0) {
         shell.exit(1);
     }
 
-    if (shell.exec(`git clone https://github.com/arduino/arduino-cli.git ${repository}`).code !== 0) {
+    const { owner, repo, commitish } = (() => {
+        const pkg = require(path.join(__dirname, '..', 'package.json'));
+        if (!pkg) {
+            shell.echo(`Could not parse the 'package.json'.`);
+            shell.exit(1);
+        }
+
+        const { arduino } = pkg;
+        if (!arduino) {
+            return { owner: 'arduino', repo: 'arduino-cli' };
+        }
+
+        const { cli } = arduino;
+        if (!cli) {
+            return { owner: 'arduino', repo: 'arduino-cli' };
+        }
+
+        const { version } = cli;
+        if (!version) {
+            return { owner: 'arduino', repo: 'arduino-cli' };
+        }
+
+        if (typeof version === 'string') {
+            return { owner: 'arduino', repo: 'arduino-cli' };
+        }
+
+        // We assume an object with `owner`, `repo`, commitish?` properties.
+        const { owner, repo, commitish } = version;
+        if (!owner) {
+            shell.echo(`Could not retrieve 'owner' from ${JSON.stringify(version)}`);
+            shell.exit(1);
+        }
+        if (!repo) {
+            shell.echo(`Could not retrieve 'repo' from ${JSON.stringify(version)}`);
+            shell.exit(1);
+        }
+
+        return { owner, repo, commitish };
+    })();
+
+    const url = `https://github.com/${owner}/${repo}.git`;
+    shell.echo(`>>> Cloning repository from '${url}'...`);
+    if (shell.exec(`git clone ${url} ${repository}`).code !== 0) {
         shell.exit(1);
     }
-    if (version !== 'nightly') {
+    shell.echo(`<<< Repository cloned.`);
+
+    const { platform } = process;
+    const build = path.join(__dirname, '..', 'build');
+    const cli = path.join(build, `arduino-cli${platform === 'win32' ? '.exe' : ''}`);
+    const versionJson = shell.exec(`${cli} version --format json`).trim();
+    if (!versionJson) {
+        shell.echo(`Could not retrieve the CLI version from ${cli}.`);
+        shell.exit(1);
+    }
+    // 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 tagged version: '${commitish}'.`);
+    } else if (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 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:');
+
+    shell.echo('>>> Generating TS/JS API from:');
     if (shell.exec(`git -C ${repository} rev-parse --abbrev-ref HEAD`).code !== 0) {
         shell.exit(1);
     }
-    if (shell.exec(`git -C ${repository} rev-parse --short HEAD`).code !== 0) {
-        shell.exit(1);
-    }
-
-    const pluginExec = shell.which('grpc_tools_node_protoc_plugin');
-    if (!pluginExec || pluginExec.code !== 0) {
-        shell.exit(1);
-    }
-    const plugin = pluginExec.stdout.trim();
 
     const rpc = path.join(repository, 'rpc');
     const out = path.join(__dirname, '..', 'src', 'node', 'cli-protocol');
+    shell.mkdir('-p', out);
+
+    const protos = await new Promise(resolve =>
+        glob('**/*.proto', { cwd: rpc }, (error, matches) => {
+            if (error) {
+                shell.echo(error.stack);
+                resolve([]);
+                return;
+            }
+            resolve(matches.map(filename => path.join(rpc, filename)));
+        }));
+    if (!protos || protos.length === 0) {
+        shell.echo(`Could not find any .proto files under ${rpc}.`);
+        shell.exit(1);
+    }
+
     // Generate JS code from the `.proto` files.
     if (shell.exec(`grpc_tools_node_protoc \
 --js_out=import_style=commonjs,binary:${out} \
---grpc_out=${out} \
---plugin=protoc-gen-grpc=${plugin} \
+--grpc_out=generate_package_definition:${out} \
 -I ${rpc} \
-${path.join(rpc, '/**/*.proto')}`).code !== 0) {
+${protos.join(' ')}`).code !== 0) {
         shell.exit(1);
     }
 
     // Generate the `.d.ts` files for JS.
     if (shell.exec(`protoc \
---plugin=protoc-gen-ts=${path.resolve(__dirname, '..', 'node_modules', '.bin', 'protoc-gen-ts')} \
---ts_out=${out} \
+--plugin=protoc-gen-ts=${path.resolve(__dirname, '..', 'node_modules', '.bin', `protoc-gen-ts${platform === 'win32' ? '.cmd' : ''}`)} \
+--ts_out=generate_package_definition:${out} \
 -I ${rpc} \
-${path.join(rpc, '/**/*.proto')}`).code !== 0) {
+${protos.join(' ')}`).code !== 0) {
         shell.exit(1);
     }
 
-    const { patch } = require('./patch-grpc-js');
-    patch([out])
-    shell.echo('Done.');
+    shell.echo('<<< Generation was successful.');
 
-})();
+})();

arduino-ide-extension/scripts/patch-grpc-js.js

@@ -1,38 +0,0 @@
-// Use `@grpc/grpc-js` instead of `grpc` at runtime.
-// https://github.com/grpc/grpc-node/issues/624
-// https://github.com/grpc/grpc-node/issues/931
-
-const fs = require('fs');
-const path = require('path');
-
-module.exports.patch = function (roots = [path.join(__dirname, '..', 'src', 'node')]) {
-    console.info('🔧  <<< Patching code...');
-    patch(roots);
-    console.info('👌  <<< Done. The code has been patched.');
-};
-
-function patch(paths) {
-    for (const p of paths) {
-        const exist = fs.existsSync(p);
-        if (exist) {
-            const stat = fs.statSync(p);
-            if (stat.isDirectory()) {
-                console.info(`🔧  >>> Scanning code in ${p}...`);
-                patch(fs.readdirSync(p).map(name => path.join(p, name)));
-            } else {
-                let content = fs.readFileSync(p, { encoding: 'utf8' });
-                if (content.indexOf("require('grpc')") !== -1) {
-                    console.info(`Updated require('grpc') to require('@grpc/grpc-js') in ${p}.`);
-                    fs.writeFileSync(p, content.replace("require('grpc')", "require('@grpc/grpc-js')"));
-                }
-                content = fs.readFileSync(p, { encoding: 'utf8' });
-                if (content.indexOf('import * as grpc from "grpc"') !== -1) {
-                    console.info(`Updated import * as grpc from "grpc" to import * as grpc from "@grpc/grpc-js" in ${p}.`);
-                    fs.writeFileSync(p, content.replace('import * as grpc from "grpc"', 'import * as grpc from "@grpc/grpc-js"'));
-                }
-            }
-        } else {
-            console.warn(`${p} does not exist. Skipping.`);
-        }
-    }
-}

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

@@ -1,45 +1,23 @@
 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 VERIFY: Command = {
-        id: 'arduino-verify',
-        label: 'Verify Sketch'
-    }
+    export const TOGGLE_COMPILE_FOR_DEBUG: Command = {
+        id: 'arduino-toggle-compile-for-debug'
+    };
 
-    export const UPLOAD: Command = {
-        id: 'arduino-upload',
-        label: 'Upload Sketch'
-    }
-
-    export const SHOW_OPEN_CONTEXT_MENU: Command = {
-        id: 'arduino-show-open-context-menu',
-        label: 'Open Sketch'
-    }
-
-    export const OPEN_FILE_NAVIGATOR: Command = {
-        id: 'arduino-open-file-navigator'
-    }
-
-    export const OPEN_SKETCH: Command = {
-        id: 'arduino-open-file'
-    }
-
-    export const SAVE_SKETCH: Command = {
-        id: 'arduino-save-file'
-    }
-
-    export const NEW_SKETCH: Command = {
-        id: "arduino-new-sketch",
-        label: 'New Sketch',
-        category: 'File'
-    }
+    /**
+     * Unlike `OPEN_SKETCH`, it opens all files from a sketch folder. (ino, cpp, etc...)
+     */
+    export const OPEN_SKETCH_FILES: Command = {
+        id: 'arduino-open-sketch-files'
+    };
 
     export const 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"
-    }
 }

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

@@ -1,73 +1,60 @@
-import * as React from 'react';
-import { injectable, inject, postConstruct } from 'inversify';
-import URI from '@theia/core/lib/common/uri';
-import { EditorWidget } from '@theia/editor/lib/browser/editor-widget';
-import { MessageService } from '@theia/core/lib/common/message-service';
-import { CommandContribution, CommandRegistry, Command, CommandHandler } from '@theia/core/lib/common/command';
-import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import { BoardsService } from '../common/protocol/boards-service';
-import { ArduinoCommands } from './arduino-commands';
-import { CoreService } from '../common/protocol/core-service';
-import { WorkspaceServiceExt } from './workspace-service-ext';
-import { ToolOutputServiceClient } from '../common/protocol/tool-output-service';
-import { QuickPickService } from '@theia/core/lib/common/quick-pick-service';
-import { BoardsListWidgetFrontendContribution } from './boards/boards-widget-frontend-contribution';
-import { BoardsServiceClientImpl } from './boards/boards-service-client-impl';
-import { WorkspaceRootUriAwareCommandHandler, WorkspaceCommands } from '@theia/workspace/lib/browser/workspace-commands';
-import { SelectionService, MenuContribution, MenuModelRegistry, MAIN_MENU_BAR, MenuPath } from '@theia/core';
-import { ArduinoToolbar } from './toolbar/arduino-toolbar';
-import { EditorManager, EditorMainMenu } from '@theia/editor/lib/browser';
+import { Mutex } from 'async-mutex';
+import { MAIN_MENU_BAR, MenuContribution, MenuModelRegistry, SelectionService, ILogger } from '@theia/core';
 import {
     ContextMenuRenderer,
-    OpenerService,
-    Widget,
-    StatusBar,
-    StatusBarAlignment,
-    QuickOpenService,
-    ApplicationShell,
-    FrontendApplicationContribution,
-    FrontendApplication
+    FrontendApplication, FrontendApplicationContribution,
+    OpenerService, StatusBar, StatusBarAlignment
 } from '@theia/core/lib/browser';
-import { OpenFileDialogProps, FileDialogService } from '@theia/filesystem/lib/browser/file-dialog';
-import { FileSystem, FileStat } from '@theia/filesystem/lib/common';
-import { Sketch, SketchesService } from '../common/protocol/sketches-service';
-import { WindowService } from '@theia/core/lib/browser/window/window-service';
-import { CommonCommands, CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';
-import { FileSystemCommands } from '@theia/filesystem/lib/browser/filesystem-frontend-contribution';
-import { FileDownloadCommands } from '@theia/filesystem/lib/browser/download/file-download-command-contribution';
+import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
+import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
+import { CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';
+import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+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 { 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';
-import { TerminalMenus } from '@theia/terminal/lib/browser/terminal-frontend-contribution';
-import { MaybePromise } from '@theia/core/lib/common/types';
-import { BoardsConfigDialog } from './boards/boards-config-dialog';
-import { BoardsToolBarItem } from './boards/boards-toolbar-item';
-import { BoardsConfig } from './boards/boards-config';
-import { ConfigService } from '../common/protocol/config-service';
-import { MonitorConnection } from './monitor/monitor-connection';
-import { MonitorViewContribution } from './monitor/monitor-view-contribution';
-import { ArduinoWorkspaceService } from './arduino-workspace-service';
 import { FileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution';
 import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution';
-import { ProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution';
+import { OutputContribution } from '@theia/output/lib/browser/output-contribution';
 import { ScmContribution } from '@theia/scm/lib/browser/scm-contribution';
 import { SearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution';
-import { FileNavigatorCommands } from '@theia/navigator/lib/browser/navigator-contribution';
-import { ArduinoShellLayoutRestorer } from './shell/arduino-shell-layout-restorer';
+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 { ArduinoDaemon } from '../common/protocol/arduino-daemon';
+import { ConfigService } from '../common/protocol/config-service';
+import { FileSystemExt } from '../common/protocol/filesystem-ext';
+import { ArduinoCommands } from './arduino-commands';
+import { BoardsConfig } from './boards/boards-config';
+import { BoardsConfigDialog } from './boards/boards-config-dialog';
+import { BoardsDataStore } from './boards/boards-data-store';
+import { BoardsServiceProvider } from './boards/boards-service-provider';
+import { BoardsToolBarItem } from './boards/boards-toolbar-item';
 import { EditorMode } from './editor-mode';
-
-export namespace ArduinoMenus {
-    export const SKETCH = [...MAIN_MENU_BAR, '3_sketch'];
-    export const TOOLS = [...MAIN_MENU_BAR, '4_tools'];
-}
-
-export namespace ArduinoToolbarContextMenu {
-    export const OPEN_SKETCH_PATH: MenuPath = ['arduino-open-sketch-context-menu'];
-    export const OPEN_GROUP: MenuPath = [...OPEN_SKETCH_PATH, '1_open'];
-    export const WS_SKETCHES_GROUP: MenuPath = [...OPEN_SKETCH_PATH, '2_sketches'];
-    export const EXAMPLE_SKETCHES_GROUP: MenuPath = [...OPEN_SKETCH_PATH, '3_examples'];
-}
+import { ArduinoMenus } from './menu/arduino-menus';
+import { MonitorConnection } from './monitor/monitor-connection';
+import { MonitorViewContribution } from './monitor/monitor-view-contribution';
+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';
+import { OutputService } from '../common/protocol/output-service';
+import { ArduinoPreferences } from './arduino-preferences';
+import { SketchesServiceClientImpl } from '../common/protocol/sketches-service-client-impl';
+import { SaveAsSketch } from './contributions/save-as-sketch';
 
 @injectable()
-export class ArduinoFrontendContribution implements FrontendApplicationContribution, TabBarToolbarContribution, CommandContribution, MenuContribution {
+export class ArduinoFrontendContribution implements FrontendApplicationContribution,
+    TabBarToolbarContribution, CommandContribution, MenuContribution, ColorContribution {
+
+    @inject(ILogger)
+    protected logger: ILogger;
 
     @inject(MessageService)
     protected readonly messageService: MessageService;
@@ -78,20 +65,8 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
     @inject(CoreService)
     protected readonly coreService: CoreService;
 
-    @inject(WorkspaceServiceExt)
-    protected readonly workspaceServiceExt: WorkspaceServiceExt;
-
-    @inject(ToolOutputServiceClient)
-    protected readonly toolOutputServiceClient: ToolOutputServiceClient;
-
-    @inject(QuickPickService)
-    protected readonly quickPickService: QuickPickService;
-
-    @inject(BoardsListWidgetFrontendContribution)
-    protected readonly boardsListWidgetFrontendContribution: BoardsListWidgetFrontendContribution;
-
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClientImpl: BoardsServiceProvider;
 
     @inject(SelectionService)
     protected readonly selectionService: SelectionService;
@@ -105,14 +80,8 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
     @inject(FileDialogService)
     protected readonly fileDialogService: FileDialogService;
 
-    @inject(FileSystem)
-    protected readonly fileSystem: FileSystem;
-
-    @inject(OpenerService)
-    protected readonly openerService: OpenerService;
-
-    @inject(WindowService)
-    protected readonly windowService: WindowService;
+    @inject(FileService)
+    protected readonly fileSystem: FileService;
 
     @inject(SketchesService)
     protected readonly sketchService: SketchesService;
@@ -129,27 +98,18 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
     @inject(StatusBar)
     protected readonly statusBar: StatusBar;
 
-    @inject(ArduinoShellLayoutRestorer)
-    protected readonly layoutRestorer: ArduinoShellLayoutRestorer;
-
-    @inject(QuickOpenService)
-    protected readonly quickOpenService: QuickOpenService;
-
-    @inject(ArduinoWorkspaceService)
-    protected readonly workspaceService: ArduinoWorkspaceService;
-
-    @inject(ConfigService)
-    protected readonly configService: ConfigService;
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
 
     @inject(MonitorConnection)
     protected readonly monitorConnection: MonitorConnection;
 
-    @inject(ApplicationShell)
-    protected readonly shell: ApplicationShell;
-
     @inject(FileNavigatorContribution)
     protected readonly fileNavigatorContributions: FileNavigatorContribution;
 
+    @inject(OutputContribution)
+    protected readonly outputContribution: OutputContribution;
+
     @inject(OutlineViewContribution)
     protected readonly outlineContribution: OutlineViewContribution;
 
@@ -165,422 +125,328 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
     @inject(EditorMode)
     protected readonly editorMode: EditorMode;
 
-    protected application: FrontendApplication;
-    protected wsSketchCount: number = 0; // TODO: this does not belong here, does it?
+    @inject(ArduinoDaemon)
+    protected readonly daemon: ArduinoDaemon;
+
+    @inject(OpenerService)
+    protected readonly openerService: OpenerService;
+
+    @inject(ConfigService)
+    protected readonly configService: ConfigService;
+
+    @inject(BoardsDataStore)
+    protected readonly boardsDataStore: BoardsDataStore;
+
+    @inject(MainMenuManager)
+    protected readonly mainMenuManager: MainMenuManager;
+
+    @inject(FileSystemExt)
+    protected readonly fileSystemExt: FileSystemExt;
+
+    @inject(HostedPluginSupport)
+    protected hostedPluginSupport: HostedPluginSupport;
+
+    @inject(ExecutableService)
+    protected executableService: ExecutableService;
+
+    @inject(OutputService)
+    protected readonly outputService: OutputService;
+
+    @inject(ArduinoPreferences)
+    protected readonly arduinoPreferences: ArduinoPreferences;
+
+    @inject(SketchesServiceClientImpl)
+    protected readonly sketchServiceClient: SketchesServiceClientImpl;
+
+    protected invalidConfigPopup: Promise<void | 'No' | 'Yes' | undefined> | undefined;
 
     @postConstruct()
     protected async init(): Promise<void> {
-        // This is a hack. Otherwise, the backend services won't bind.
-        await this.workspaceServiceExt.roots();
-
-        const updateStatusBar = (config: BoardsConfig.Config) => {
+        if (!window.navigator.onLine) {
+            // tslint:disable-next-line:max-line-length
+            this.messageService.warn('You appear to be offline. Without an Internet connection, the Arduino CLI might not be able to download the required resources and could cause malfunction. Please connect to the Internet and restart the application.');
+        }
+        const updateStatusBar = ({ selectedBoard, selectedPort }: BoardsConfig.Config) => {
             this.statusBar.setElement('arduino-selected-board', {
                 alignment: StatusBarAlignment.RIGHT,
-                text: BoardsConfig.Config.toString(config)
+                text: selectedBoard ? `$(microchip) ${selectedBoard.name}` : '$(close) no board selected',
+                className: 'arduino-selected-board'
             });
+            if (selectedBoard) {
+                this.statusBar.setElement('arduino-selected-port', {
+                    alignment: StatusBarAlignment.RIGHT,
+                    text: selectedPort ? `on ${Port.toString(selectedPort)}` : '[not connected]',
+                    className: 'arduino-selected-port'
+                });
+            }
         }
-        this.boardsServiceClient.onBoardsConfigChanged(updateStatusBar);
-        updateStatusBar(this.boardsServiceClient.boardsConfig);
-
-        this.registerSketchesInMenu(this.menuRegistry);
-
-        Promise.all([
-            this.boardsService.getAttachedBoards(),
-            this.boardsService.getAvailablePorts()
-        ]).then(([{ boards }, { ports }]) => this.boardsServiceClient.tryReconnect(boards, ports));
+        this.boardsServiceClientImpl.onBoardsConfigChanged(updateStatusBar);
+        updateStatusBar(this.boardsServiceClientImpl.boardsConfig);
     }
 
     onStart(app: FrontendApplication): void {
-        this.application = app;
         // Initialize all `pro-mode` widgets. This is a NOOP if in normal mode.
         for (const viewContribution of [
             this.fileNavigatorContributions,
+            this.outputContribution,
             this.outlineContribution,
             this.problemContribution,
             this.scmContribution,
             this.siwContribution] as Array<FrontendApplicationContribution>) {
-
             if (viewContribution.initializeLayout) {
-                viewContribution.initializeLayout(this.application);
+                viewContribution.initializeLayout(app);
             }
         }
+        const start = async ({ selectedBoard }: BoardsConfig.Config) => {
+            if (selectedBoard) {
+                const { name, fqbn } = selectedBoard;
+                if (fqbn) {
+                    this.startLanguageServer(fqbn, name);
+                }
+            }
+        };
+        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 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.fileSystem.fsPath(new URI(currentSketch.uri));
+                }
+            }
+            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.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,
+                    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 {
-        registry.registerItem({
-            id: ArduinoCommands.VERIFY.id,
-            command: ArduinoCommands.VERIFY.id,
-            tooltip: 'Verify'
-        });
-        registry.registerItem({
-            id: ArduinoCommands.UPLOAD.id,
-            command: ArduinoCommands.UPLOAD.id,
-            tooltip: 'Upload'
-        });
-        registry.registerItem({
-            id: ArduinoCommands.SHOW_OPEN_CONTEXT_MENU.id,
-            command: ArduinoCommands.SHOW_OPEN_CONTEXT_MENU.id,
-            tooltip: 'Open'
-        });
-        registry.registerItem({
-            id: ArduinoCommands.SAVE_SKETCH.id,
-            command: ArduinoCommands.SAVE_SKETCH.id,
-            tooltip: 'Save'
-        });
         registry.registerItem({
             id: BoardsToolBarItem.TOOLBAR_ID,
             render: () => <BoardsToolBarItem
                 key='boardsToolbarItem'
                 commands={this.commandRegistry}
-                boardsServiceClient={this.boardsServiceClient}
-                boardService={this.boardsService} />,
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left'
+                boardsServiceClient={this.boardsServiceClientImpl} />,
+            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
+            priority: 7
         });
         registry.registerItem({
             id: 'toggle-serial-monitor',
-            command: MonitorViewContribution.OPEN_SERIAL_MONITOR,
-            tooltip: 'Toggle Serial Monitor',
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'right'
-        });
-
-        registry.registerItem({
-            id: ArduinoCommands.TOGGLE_ADVANCED_MODE.id,
-            command: ArduinoCommands.TOGGLE_ADVANCED_MODE.id,
-            tooltip: 'Toggle Advanced Mode',
-            text: (this.editorMode.proMode ? '$(toggle-on)' : '$(toggle-off)'),
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'right'
+            command: MonitorViewContribution.TOGGLE_SERIAL_MONITOR_TOOLBAR,
+            tooltip: 'Serial Monitor'
         });
     }
 
     registerCommands(registry: CommandRegistry): void {
-        // TODO: use proper API https://github.com/eclipse-theia/theia/pull/6599
-        const allHandlers: { [id: string]: CommandHandler[] } = (registry as any)._handlers;
-        // Make sure to reveal the `Explorer` before executing `New File` and `New Folder`.
-        for (const command of [WorkspaceCommands.NEW_FILE, WorkspaceCommands.NEW_FOLDER]) {
-            const { id } = command;
-            const handlers = allHandlers[id].slice();
-            registry.unregisterCommand(id);
-            registry.registerCommand(command);
-            for (const handler of handlers) {
-                const wrapper: CommandHandler = {
-                    execute: (...args: any[]) => {
-                        this.fileNavigatorContributions.openView({ reveal: true }).then(() => handler.execute(args));
-                    },
-                    isVisible: (...args: any[]) => {
-                        return handler.isVisible!(args);
-                    },
-                    isEnabled: (args: any[]) => {
-                        return handler.isEnabled!(args);
-                    },
-                    isToggled: (args: any[]) => {
-                        return handler.isToggled!(args);
-                    }
-                };
-                if (!handler.isEnabled) {
-                    delete wrapper.isEnabled;
-                }
-                if (!handler.isToggled) {
-                    delete wrapper.isToggled;
-                }
-                if (!handler.isVisible) {
-                    delete wrapper.isVisible;
-                }
-                registry.registerHandler(id, wrapper);
-            }
-        }
-
-        registry.registerCommand(ArduinoCommands.VERIFY, {
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
-            isEnabled: widget => true,
-            execute: async () => {
-                const widget = this.getCurrentWidget();
-                if (widget instanceof EditorWidget) {
-                    await widget.saveable.save();
-                }
-
-                const uri = this.toUri(widget);
-                if (!uri) {
-                    return;
-                }
-
-                try {
-                    const { boardsConfig } = this.boardsServiceClient;
-                    if (!boardsConfig || !boardsConfig.selectedBoard) {
-                        throw new Error('No boards selected. Please select a board.');
-                    }
-                    if (!boardsConfig.selectedBoard.fqbn) {
-                        throw new Error(`No core is installed for ${boardsConfig.selectedBoard.name}. Please install the board.`);
-                    }
-                    await this.coreService.compile({ uri: uri.toString(), board: boardsConfig.selectedBoard });
-                } catch (e) {
-                    await this.messageService.error(e.toString());
-                }
+        registry.registerCommand(ArduinoCommands.TOGGLE_COMPILE_FOR_DEBUG, {
+            execute: () => this.editorMode.toggleCompileForDebug(),
+            isToggled: () => this.editorMode.compileForDebug
+        });
+        registry.registerCommand(ArduinoCommands.OPEN_SKETCH_FILES, {
+            execute: async (uri: URI) => {
+                this.openSketchFiles(uri);
             }
         });
-        registry.registerCommand(ArduinoCommands.UPLOAD, {
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
-            isEnabled: widget => true,
-            execute: async () => {
-                const widget = this.getCurrentWidget();
-                if (widget instanceof EditorWidget) {
-                    await widget.saveable.save();
-                }
-
-                const uri = this.toUri(widget);
-                if (!uri) {
-                    return;
-                }
-
-                const monitorConfig = this.monitorConnection.monitorConfig;
-                if (monitorConfig) {
-                    await this.monitorConnection.disconnect();
-                }
-
-                try {
-                    const { boardsConfig } = this.boardsServiceClient;
-                    if (!boardsConfig || !boardsConfig.selectedBoard) {
-                        throw new Error('No boards selected. Please select a board.');
-                    }
-                    const { selectedPort } = boardsConfig;
-                    if (!selectedPort) {
-                        throw new Error('No ports selected. Please select a port.');
-                    }
-                    await this.coreService.upload({ uri: uri.toString(), board: boardsConfig.selectedBoard, port: selectedPort.address });
-                } catch (e) {
-                    await this.messageService.error(e.toString());
-                } finally {
-                    if (monitorConfig) {
-                        await this.monitorConnection.connect(monitorConfig);
-                    }
-                }
-            }
-        });
-        registry.registerCommand(ArduinoCommands.SHOW_OPEN_CONTEXT_MENU, {
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
-            isEnabled: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
-            execute: async (widget: Widget, target: EventTarget) => {
-                if (this.wsSketchCount) {
-                    const el = (target as HTMLElement).parentElement;
-                    if (el) {
-                        this.contextMenuRenderer.render(ArduinoToolbarContextMenu.OPEN_SKETCH_PATH, {
-                            x: el.getBoundingClientRect().left,
-                            y: el.getBoundingClientRect().top + el.offsetHeight
-                        });
-                    }
-                } else {
-                    this.commandRegistry.executeCommand(ArduinoCommands.OPEN_FILE_NAVIGATOR.id);
-                }
-            }
-        });
-        registry.registerCommand(ArduinoCommands.OPEN_FILE_NAVIGATOR, {
-            isEnabled: () => true,
-            execute: () => this.doOpenFile()
-        })
-        registry.registerCommand(ArduinoCommands.OPEN_SKETCH, {
-            isEnabled: () => true,
-            execute: async (sketch: Sketch) => {
-                this.workspaceService.open(new URI(sketch.uri));
-            }
-        })
-        registry.registerCommand(ArduinoCommands.SAVE_SKETCH, {
-            isEnabled: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
-            execute: async (sketch: Sketch) => {
-                registry.executeCommand(CommonCommands.SAVE_ALL.id);
-            }
-        })
-        registry.registerCommand(ArduinoCommands.NEW_SKETCH, new WorkspaceRootUriAwareCommandHandler(this.workspaceService, this.selectionService, {
-            execute: async uri => {
-                try {
-                    // hack: sometimes we don't get the workspace root, but the currently active file: correct for that
-                    if (uri.path.ext !== "") {
-                        uri = uri.withPath(uri.path.dir.dir);
-                    }
-
-                    const sketch = await this.sketchService.createNewSketch(uri.toString());
-                    this.workspaceService.open(new URI(sketch.uri));
-                } catch (e) {
-                    await this.messageService.error(e.toString());
-                }
-            }
-        }));
         registry.registerCommand(ArduinoCommands.OPEN_BOARDS_DIALOG, {
-            isEnabled: () => true,
-            execute: async () => {
-                const boardsConfig = await this.boardsConfigDialog.open();
+            execute: async (query?: string | undefined) => {
+                const boardsConfig = await this.boardsConfigDialog.open(query);
                 if (boardsConfig) {
-                    this.boardsServiceClient.boardsConfig = boardsConfig;
+                    this.boardsServiceClientImpl.boardsConfig = boardsConfig;
                 }
             }
-        })
-        registry.registerCommand(ArduinoCommands.TOGGLE_ADVANCED_MODE, {
-            execute: () => this.editorMode.toggle(),
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'right',
-            isToggled: () => this.editorMode.proMode
-        })
+        });
     }
 
     registerMenus(registry: MenuModelRegistry) {
-        if (!this.editorMode.proMode) {
-            // If are not in pro-mode, we have to disable the context menu for the tabs.
-            // Such as `Close`, `Close All`, etc.
-            for (const command of [
-                CommonCommands.CLOSE_TAB,
-                CommonCommands.CLOSE_OTHER_TABS,
-                CommonCommands.CLOSE_RIGHT_TABS,
-                CommonCommands.CLOSE_ALL_TABS,
-                CommonCommands.COLLAPSE_PANEL,
-                CommonCommands.TOGGLE_MAXIMIZED,
-                FileNavigatorCommands.REVEAL_IN_NAVIGATOR
-            ]) {
-                registry.unregisterMenuAction(command);
-            }
-
-            registry.unregisterMenuAction(FileSystemCommands.UPLOAD);
-            registry.unregisterMenuAction(FileDownloadCommands.DOWNLOAD);
-
-            registry.unregisterMenuAction(WorkspaceCommands.OPEN_FOLDER);
-            registry.unregisterMenuAction(WorkspaceCommands.OPEN_WORKSPACE);
-            registry.unregisterMenuAction(WorkspaceCommands.OPEN_RECENT_WORKSPACE);
-            registry.unregisterMenuAction(WorkspaceCommands.SAVE_WORKSPACE_AS);
-            registry.unregisterMenuAction(WorkspaceCommands.CLOSE);
-
-            registry.getMenu(MAIN_MENU_BAR).removeNode(this.getMenuId(MonacoMenus.SELECTION));
-            registry.getMenu(MAIN_MENU_BAR).removeNode(this.getMenuId(EditorMainMenu.GO));
-            registry.getMenu(MAIN_MENU_BAR).removeNode(this.getMenuId(TerminalMenus.TERMINAL));
-            registry.getMenu(MAIN_MENU_BAR).removeNode(this.getMenuId(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.registerMenuAction(ArduinoMenus.SKETCH, {
-            commandId: ArduinoCommands.VERIFY.id,
-            label: 'Verify/Compile',
-            order: '1'
-        });
-        registry.registerMenuAction(ArduinoMenus.SKETCH, {
-            commandId: ArduinoCommands.UPLOAD.id,
-            label: 'Upload',
-            order: '2'
-        });
-        registry.registerMenuAction(ArduinoToolbarContextMenu.OPEN_GROUP, {
-            commandId: ArduinoCommands.OPEN_FILE_NAVIGATOR.id,
-            label: 'Open...'
-        });
-
         registry.registerSubmenu(ArduinoMenus.TOOLS, 'Tools');
-
-        registry.registerMenuAction(CommonMenus.HELP, {
-            commandId: ArduinoCommands.TOGGLE_ADVANCED_MODE.id,
-            label: 'Advanced Mode'
-        });
-
-        registry.registerMenuAction([...CommonMenus.FILE, '0_new_sketch'], {
-            commandId: ArduinoCommands.NEW_SKETCH.id
+        registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
+            commandId: ArduinoCommands.TOGGLE_COMPILE_FOR_DEBUG.id,
+            label: 'Optimize for Debugging',
+            order: '4'
         });
     }
 
-    protected getMenuId(menuPath: string[]): string {
-        const index = menuPath.length - 1;
-        const menuId = menuPath[index];
-        return menuId;
-    }
-
-    protected async registerSketchesInMenu(registry: MenuModelRegistry): Promise<void> {
-        this.sketchService.getSketches().then(sketches => {
-            this.wsSketchCount = sketches.length;
-            sketches.forEach(sketch => {
-                const command: Command = {
-                    id: 'openSketch' + sketch.name
-                }
-                this.commandRegistry.registerCommand(command, {
-                    execute: () => this.commandRegistry.executeCommand(ArduinoCommands.OPEN_SKETCH.id, sketch)
+    protected async openSketchFiles(uri: URI): Promise<void> {
+        try {
+            const sketch = await this.sketchService.loadSketch(uri.toString());
+            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 });
+                    }
                 });
-
-                registry.registerMenuAction(ArduinoToolbarContextMenu.WS_SKETCHES_GROUP, {
-                    commandId: command.id,
-                    label: sketch.name
-                });
-            })
-        })
-    }
-
-    async openSketchFiles(uri: string): Promise<void> {
-        this.sketchService.getSketchFiles(uri).then(uris => {
-            for (const uri of uris) {
-                this.editorManager.open(new URI(uri));
             }
-        });
+        } catch (e) {
+            console.error(e);
+            const message = e instanceof Error ? e.message : JSON.stringify(e);
+            this.messageService.error(message);
+        }
     }
 
-    /**
-     * Opens a file after prompting the `Open File` dialog. Resolves to `undefined`, if
-     *  - the workspace root is not set,
-     *  - the file to open does not exist, or
-     *  - it was not a file, but a directory.
-     *
-     * Otherwise, resolves to the URI of the file.
-     */
-    protected async doOpenFile(): Promise<URI | undefined> {
-        const props: OpenFileDialogProps = {
-            title: WorkspaceCommands.OPEN_FILE.dialogLabel,
-            canSelectFolders: false,
-            canSelectFiles: true
-        };
-        const [rootStat] = await this.workspaceService.roots;
-        const destinationFileUri = await this.fileDialogService.showOpenDialog(props, rootStat);
-        if (destinationFileUri) {
-            const destinationFile = await this.fileSystem.getFileStat(destinationFileUri.toString());
-            if (destinationFile && !destinationFile.isDirectory) {
-                const message = await this.validate(destinationFile);
-                if (!message) {
-                    this.workspaceService.open(destinationFileUri);
-                    return destinationFileUri;
-                } else {
-                    this.messageService.warn(message);
-                }
+    protected async ensureOpened(uri: string, forceOpen: boolean = false): Promise<any> {
+        const widget = this.editorManager.all.find(widget => widget.editor.uri.toString() === uri);
+        if (!widget || forceOpen) {
+            return this.editorManager.open(new URI(uri));
+        }
+    }
+
+    registerColors(colors: ColorRegistry): void {
+        colors.register(
+            {
+                id: 'arduino.branding.primary',
+                defaults: {
+                    dark: 'statusBar.background',
+                    light: 'statusBar.background'
+                },
+                description: 'The primary branding color, such as dialog titles, library, and board manager list labels.'
+            },
+            {
+                id: 'arduino.branding.secondary',
+                defaults: {
+                    dark: 'statusBar.background',
+                    light: 'statusBar.background'
+                },
+                description: 'Secondary branding color for list selections, dropdowns, and widget borders.'
+            },
+            {
+                id: 'arduino.foreground',
+                defaults: {
+                    dark: 'editorWidget.background',
+                    light: 'editorWidget.background',
+                    hc: 'editorWidget.background'
+                },
+                description: 'Color of the Arduino IDE foreground which is used for dialogs, such as the Select Board dialog.'
+            },
+            {
+                id: 'arduino.toolbar.background',
+                defaults: {
+                    dark: 'button.background',
+                    light: 'button.background',
+                    hc: 'activityBar.inactiveForeground'
+                },
+                description: 'Background color of the toolbar items. Such as Upload, Verify, etc.'
+            },
+            {
+                id: 'arduino.toolbar.hoverBackground',
+                defaults: {
+                    dark: 'button.hoverBackground',
+                    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: {
+                    dark: 'editor.foreground',
+                    light: 'editor.foreground',
+                    hc: 'editor.foreground'
+                },
+                description: 'Color of the text in the Output view.'
+            },
+            {
+                id: 'arduino.output.background',
+                defaults: {
+                    dark: 'editor.background',
+                    light: 'editor.background',
+                    hc: 'editor.background'
+                },
+                description: 'Background color of the Output view.'
             }
-        }
-        return undefined;
-    }
-
-    protected getCurrentWidget(): EditorWidget | undefined {
-        let widget = this.editorManager.currentEditor;
-        if (!widget) {
-            const visibleWidgets = this.editorManager.all.filter(w => w.isVisible);
-            if (visibleWidgets.length > 0) {
-                widget = visibleWidgets[0];
-            }
-        }
-        return widget;
-    }
-
-    /**
-     * Returns `undefined` if the `file` is valid. Otherwise, returns with the validation error message.
-     */
-    protected validate(file: FileStat): MaybePromise<string | undefined> {
-        const uri = new URI(file.uri);
-        const path = uri.path;
-        const { name, ext, dir } = path;
-        if (ext !== '.ino') {
-            return "Only sketches with '.ino' extension can be opened.";
-        }
-        if (name !== dir.name) {
-            return `The file "${name}${ext}" needs to be inside a sketch folder named "${name}".`;
-        }
-        return undefined;
-    }
-
-    private toUri(arg: any): URI | undefined {
-        if (arg instanceof URI) {
-            return arg;
-        }
-        if (typeof arg === 'string') {
-            return new URI(arg);
-        }
-        if (arg instanceof EditorWidget) {
-            return arg.editor.uri;
-        }
-        return undefined;
+        );
     }
 
 }

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

@@ -1,237 +0,0 @@
-import '../../src/browser/style/index.css';
-import { ContainerModule, interfaces } 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 } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging/ws-connection-provider';
-import { FrontendApplicationContribution, FrontendApplication } from '@theia/core/lib/browser/frontend-application'
-import { LanguageGrammarDefinitionContribution } from '@theia/monaco/lib/browser/textmate';
-import { LanguageClientContribution } from '@theia/languages/lib/browser';
-import { ArduinoLanguageClientContribution } from './language/arduino-language-client-contribution';
-import { LibraryListWidget } from './library/library-list-widget';
-import { ArduinoFrontendContribution } from './arduino-frontend-contribution';
-import { ArduinoLanguageGrammarContribution } from './language/arduino-language-grammar-contribution';
-import { LibraryService, LibraryServicePath } from '../common/protocol/library-service';
-import { BoardsService, BoardsServicePath, BoardsServiceClient } from '../common/protocol/boards-service';
-import { SketchesService, SketchesServicePath } from '../common/protocol/sketches-service';
-import { CoreService, CoreServicePath } from '../common/protocol/core-service';
-import { BoardsListWidget } from './boards/boards-list-widget';
-import { BoardsListWidgetFrontendContribution } from './boards/boards-widget-frontend-contribution';
-import { WorkspaceServiceExt, WorkspaceServiceExtPath } from './workspace-service-ext';
-import { WorkspaceServiceExtImpl } from './workspace-service-ext-impl';
-import { ToolOutputServiceClient } from '../common/protocol/tool-output-service';
-import { ToolOutputService } from '../common/protocol/tool-output-service';
-import { ToolOutputServiceClientImpl } from './tool-output/client-service-impl';
-import { BoardsServiceClientImpl } from './boards/boards-service-client-impl';
-import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
-import { ArduinoWorkspaceService } from './arduino-workspace-service';
-import { ThemeService } from '@theia/core/lib/browser/theming';
-import { ArduinoTheme } from './arduino-theme';
-import { MenuContribution } from '@theia/core';
-import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution';
-import { ArduinoOutlineViewContribution } from './customization/arduino-outline-contribution';
-import { ProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution';
-import { ArduinoProblemContribution } from './customization/arduino-problem-contribution';
-import { ArduinoNavigatorContribution } from './customization/arduino-navigator-contribution';
-import { FileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution';
-import { ArduinoToolbarContribution } from './toolbar/arduino-toolbar-contribution';
-import { OutputToolbarContribution } from '@theia/output/lib/browser/output-toolbar-contribution';
-import { ArduinoOutputToolContribution } from './customization/arduino-output-tool-contribution';
-import { EditorContribution } from '@theia/editor/lib/browser/editor-contribution';
-import { ArduinoEditorContribution } from './customization/arduino-editor-contribution';
-import { MonacoStatusBarContribution } from '@theia/monaco/lib/browser/monaco-status-bar-contribution';
-import { ArduinoMonacoStatusBarContribution } from './customization/arduino-monaco-status-bar-contribution';
-import { ApplicationShell, ShellLayoutRestorer } from '@theia/core/lib/browser';
-import { ArduinoApplicationShell } from './customization/arduino-application-shell';
-import { ArduinoFrontendApplication } from './customization/arduino-frontend-application';
-import { BoardsConfigDialog, BoardsConfigDialogProps } from './boards/boards-config-dialog';
-import { BoardsConfigDialogWidget } from './boards/boards-config-dialog-widget';
-import { ScmContribution } from '@theia/scm/lib/browser/scm-contribution';
-import { ArduinoScmContribution } from './customization/arduino-scm-contribution';
-import { SearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution';
-import { ArduinoSearchInWorkspaceContribution } from './customization/arduino-search-in-workspace-contribution';
-import { 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 { MonitorWidget } from './monitor/monitor-widget';
-import { MonitorViewContribution } from './monitor/monitor-view-contribution';
-import { MonitorConnection } from './monitor/monitor-connection';
-import { MonitorModel } from './monitor/monitor-model';
-import { MonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
-import { ArduinoMonacoEditorProvider } from './editor/arduino-monaco-editor-provider';
-import { TabBarDecoratorService } from '@theia/core/lib/browser/shell/tab-bar-decorator';
-import { ArduinoTabBarDecoratorService } from './shell/arduino-tab-bar-decorator';
-import { ProblemManager } from '@theia/markers/lib/browser';
-import { ArduinoProblemManager } from './markers/arduino-problem-manager';
-import { BoardsAutoInstaller } from './boards/boards-auto-installer';
-import { AboutDialog } from '@theia/core/lib/browser/about-dialog';
-import { ArduinoAboutDialog } from './customization/arduino-about-dialog';
-import { ArduinoShellLayoutRestorer } from './shell/arduino-shell-layout-restorer';
-import { EditorMode } from './editor-mode';
-import { ListItemRenderer } from './components/component-list/list-item-renderer';
-const ElementQueries = require('css-element-queries/src/ElementQueries');
-
-export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind) => {
-    ElementQueries.listen();
-    ElementQueries.init();
-
-    // Commands and toolbar items
-    bind(ArduinoFrontendContribution).toSelf().inSingletonScope();
-    bind(CommandContribution).toService(ArduinoFrontendContribution);
-    bind(MenuContribution).toService(ArduinoFrontendContribution);
-    bind(TabBarToolbarContribution).toService(ArduinoFrontendContribution);
-    bind(FrontendApplicationContribution).toService(ArduinoFrontendContribution);
-
-    bind(ArduinoToolbarContribution).toSelf().inSingletonScope();
-    bind(FrontendApplicationContribution).toService(ArduinoToolbarContribution);
-
-    // `ino` TextMate grammar and language client
-    bind(LanguageGrammarDefinitionContribution).to(ArduinoLanguageGrammarContribution).inSingletonScope();
-    bind(LanguageClientContribution).to(ArduinoLanguageClientContribution).inSingletonScope();
-
-    // Renderer for both the library and the core widgets.
-    bind(ListItemRenderer).toSelf().inSingletonScope();
-
-    // Library service
-    bind(LibraryService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, LibraryServicePath)).inSingletonScope();
-    // Library list widget
-    bind(LibraryListWidget).toSelf();
-    bindViewContribution(bind, LibraryListWidgetFrontendContribution);
-    bind(WidgetFactory).toDynamicValue(context => ({
-        id: LibraryListWidget.WIDGET_ID,
-        createWidget: () => context.container.get(LibraryListWidget)
-    }));
-    bind(FrontendApplicationContribution).toService(LibraryListWidgetFrontendContribution);
-
-    // Sketch list service
-    bind(SketchesService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, SketchesServicePath)).inSingletonScope();
-
-    // Config service
-    bind(ConfigService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, ConfigServicePath)).inSingletonScope();
-
-    // Boards service
-    bind(BoardsService).toDynamicValue(context => {
-        const connection = context.container.get(WebSocketConnectionProvider);
-        const client = context.container.get(BoardsServiceClientImpl);
-        return connection.createProxy(BoardsServicePath, client);
-    }).inSingletonScope();
-    // Boards service client to receive and delegate notifications from the backend.
-    bind(BoardsServiceClientImpl).toSelf().inSingletonScope();
-    bind(FrontendApplicationContribution).toService(BoardsServiceClientImpl);
-    bind(BoardsServiceClient).toDynamicValue(context => {
-        const client = context.container.get(BoardsServiceClientImpl);
-        WebSocketConnectionProvider.createProxy(context.container, BoardsServicePath, client);
-        return client;
-    }).inSingletonScope();
-
-    // boards auto-installer
-    bind(BoardsAutoInstaller).toSelf().inSingletonScope();
-    bind(FrontendApplicationContribution).toService(BoardsAutoInstaller);
-
-    // Boards list widget
-    bind(BoardsListWidget).toSelf();
-    bindViewContribution(bind, BoardsListWidgetFrontendContribution);
-    bind(WidgetFactory).toDynamicValue(context => ({
-        id: BoardsListWidget.WIDGET_ID,
-        createWidget: () => context.container.get(BoardsListWidget)
-    }));
-    bind(FrontendApplicationContribution).toService(BoardsListWidgetFrontendContribution);
-
-    // Board select dialog
-    bind(BoardsConfigDialogWidget).toSelf().inSingletonScope();
-    bind(BoardsConfigDialog).toSelf().inSingletonScope();
-    bind(BoardsConfigDialogProps).toConstantValue({
-        title: 'Select Board'
-    })
-
-    // Core service
-    bind(CoreService)
-        .toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, CoreServicePath))
-        .inSingletonScope();
-
-    // Tool output service client
-    bind(ToolOutputServiceClientImpl).toSelf().inSingletonScope();
-    bind(ToolOutputServiceClient).toDynamicValue(context => {
-        const client = context.container.get(ToolOutputServiceClientImpl);
-        WebSocketConnectionProvider.createProxy(context.container, ToolOutputService.SERVICE_PATH, client);
-        return client;
-    }).inSingletonScope();
-
-    // The workspace service extension
-    bind(WorkspaceServiceExt).to(WorkspaceServiceExtImpl).inSingletonScope().onActivation(({ container }, workspaceServiceExt: WorkspaceServiceExt) => {
-        WebSocketConnectionProvider.createProxy(container, WorkspaceServiceExtPath, workspaceServiceExt);
-        // Eagerly active the core, library, and boards services.
-        container.get(CoreService);
-        container.get(LibraryService);
-        container.get(BoardsService);
-        container.get(SketchesService);
-        return workspaceServiceExt;
-    });
-
-    // Serial Monitor
-    bind(MonitorModel).toSelf().inSingletonScope();
-    bind(FrontendApplicationContribution).toService(MonitorModel);
-    bind(MonitorWidget).toSelf();
-    bindViewContribution(bind, MonitorViewContribution);
-    bind(TabBarToolbarContribution).toService(MonitorViewContribution);
-    bind(WidgetFactory).toDynamicValue(context => ({
-        id: MonitorWidget.ID,
-        createWidget: () => context.container.get(MonitorWidget)
-    }));
-    // Frontend binding for the 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(MonitorConnection).toSelf().inSingletonScope();
-    // 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(ArduinoWorkspaceService).toSelf().inSingletonScope();
-    rebind(WorkspaceService).to(ArduinoWorkspaceService).inSingletonScope();
-
-    const themeService = ThemeService.get();
-    themeService.register(...ArduinoTheme.themes);
-
-    // Customizing default Theia layout based on the editor mode: `pro-mode` or `classic`.
-    bind(EditorMode).toSelf().inSingletonScope();
-    bind(FrontendApplicationContribution).toService(EditorMode);
-    rebind(OutlineViewContribution).to(ArduinoOutlineViewContribution).inSingletonScope();
-    rebind(ProblemContribution).to(ArduinoProblemContribution).inSingletonScope();
-    rebind(FileNavigatorContribution).to(ArduinoNavigatorContribution).inSingletonScope();
-    rebind(OutputToolbarContribution).to(ArduinoOutputToolContribution).inSingletonScope();
-    rebind(EditorContribution).to(ArduinoEditorContribution).inSingletonScope();
-    rebind(MonacoStatusBarContribution).to(ArduinoMonacoStatusBarContribution).inSingletonScope();
-    rebind(ApplicationShell).to(ArduinoApplicationShell).inSingletonScope();
-    rebind(ScmContribution).to(ArduinoScmContribution).inSingletonScope();
-    rebind(SearchInWorkspaceFrontendContribution).to(ArduinoSearchInWorkspaceContribution).inSingletonScope();
-    rebind(FrontendApplication).to(ArduinoFrontendApplication).inSingletonScope();
-
-    // Monaco customizations
-    bind(ArduinoMonacoEditorProvider).toSelf().inSingletonScope();
-    rebind(MonacoEditorProvider).toService(ArduinoMonacoEditorProvider);
-
-    // Decorator customizations
-    bind(ArduinoTabBarDecoratorService).toSelf().inSingletonScope();
-    rebind(TabBarDecoratorService).toService(ArduinoTabBarDecoratorService);
-
-    // Problem markers
-    bind(ArduinoProblemManager).toSelf().inSingletonScope();
-    rebind(ProblemManager).toService(ArduinoProblemManager);
-
-    // About dialog to show the CLI version
-    bind(ArduinoAboutDialog).toSelf().inSingletonScope();
-    rebind(AboutDialog).toService(ArduinoAboutDialog);
-
-    // Customized layout restorer that can restore the state in async way: https://github.com/eclipse-theia/theia/issues/6579
-    bind(ArduinoShellLayoutRestorer).toSelf().inSingletonScope();
-    rebind(ShellLayoutRestorer).toService(ArduinoShellLayoutRestorer);
-});

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

@@ -0,0 +1,429 @@
+import '../../src/browser/style/index.css';
+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 { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging/ws-connection-provider';
+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 { SketchesServiceClientImpl } from '../common/protocol/sketches-service-client-impl';
+import { CoreService, CoreServicePath } from '../common/protocol/core-service';
+import { BoardsListWidget } from './boards/boards-list-widget';
+import { BoardsListWidgetFrontendContribution } from './boards/boards-widget-frontend-contribution';
+import { BoardsServiceProvider } from './boards/boards-service-provider';
+import { WorkspaceService as TheiaWorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
+import { WorkspaceService } from './theia/workspace/workspace-service';
+import { OutlineViewContribution as TheiaOutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution';
+import { OutlineViewContribution } from './theia/outline/outline-contribution';
+import { ProblemContribution as TheiaProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution';
+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 { ArduinoToolbarContribution } from './toolbar/arduino-toolbar-contribution';
+import { EditorContribution as TheiaEditorContribution } from '@theia/editor/lib/browser/editor-contribution';
+import { EditorContribution } from './theia/editor/editor-contribution';
+import { MonacoStatusBarContribution as TheiaMonacoStatusBarContribution } from '@theia/monaco/lib/browser/monaco-status-bar-contribution';
+import { MonacoStatusBarContribution } from './theia/monaco/monaco-status-bar-contribution';
+import {
+    ApplicationShell as TheiaApplicationShell,
+    ShellLayoutRestorer as TheiaShellLayoutRestorer,
+    CommonFrontendContribution as TheiaCommonFrontendContribution,
+    KeybindingRegistry as TheiaKeybindingRegistry,
+    TabBarRendererFactory,
+    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 { 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';
+import { SearchInWorkspaceFrontendContribution as TheiaSearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution';
+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 { MonitorWidget } from './monitor/monitor-widget';
+import { MonitorViewContribution } from './monitor/monitor-view-contribution';
+import { MonitorConnection } from './monitor/monitor-connection';
+import { MonitorModel } from './monitor/monitor-model';
+import { TabBarDecoratorService as TheiaTabBarDecoratorService } from '@theia/core/lib/browser/shell/tab-bar-decorator';
+import { TabBarDecoratorService } from './theia/core/tab-bar-decorator';
+import { ProblemManager as TheiaProblemManager } from '@theia/markers/lib/browser';
+import { ProblemManager } from './theia/markers/problem-manager';
+import { BoardsAutoInstaller } from './boards/boards-auto-installer';
+import { ShellLayoutRestorer } from './theia/core/shell-layout-restorer';
+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 {
+    FrontendConnectionStatusService as TheiaFrontendConnectionStatusService,
+    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 {
+    WorkspaceFrontendContribution as TheiaWorkspaceFrontendContribution,
+    FileMenuContribution as TheiaFileMenuContribution,
+    WorkspaceCommandContribution as TheiaWorkspaceCommandContribution
+} from '@theia/workspace/lib/browser';
+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 { Close } from './contributions/close';
+import { SaveAsSketch } from './contributions/save-as-sketch';
+import { SaveSketch } from './contributions/save-sketch';
+import { VerifySketch } from './contributions/verify-sketch';
+import { UploadSketch } from './contributions/upload-sketch';
+import { CommonFrontendContribution } from './theia/core/common-frontend-contribution';
+import { EditContributions } from './contributions/edit-contributions';
+import { OpenSketchExternal } from './contributions/open-sketch-external';
+import { PreferencesContribution as TheiaPreferencesContribution } from '@theia/preferences/lib/browser/preferences-contribution';
+import { PreferencesContribution } from './theia/preferences/preferences-contribution';
+import { QuitApp } from './contributions/quit-app';
+import { SketchControl } from './contributions/sketch-control';
+import { Settings } from './contributions/settings';
+import { KeybindingRegistry } from './theia/core/keybindings';
+import { WorkspaceCommandContribution } from './theia/workspace/workspace-commands';
+import { WorkspaceDeleteHandler as TheiaWorkspaceDeleteHandler } from '@theia/workspace/lib/browser/workspace-delete-handler';
+import { WorkspaceDeleteHandler } from './theia/workspace/workspace-delete-handler';
+import { TabBarToolbar } from './theia/core/tab-bar-toolbar';
+import { EditorWidgetFactory as TheiaEditorWidgetFactory } from '@theia/editor/lib/browser/editor-widget-factory';
+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 { 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 { 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 { NotificationCenter } from './notification-center';
+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';
+import { EditorCommandContribution } from './theia/editor/editor-command';
+import { NavigatorTabBarDecorator as TheiaNavigatorTabBarDecorator } from '@theia/navigator/lib/browser/navigator-tab-bar-decorator';
+import { NavigatorTabBarDecorator } from './theia/navigator/navigator-tab-bar-decorator';
+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';
+
+const ElementQueries = require('css-element-queries/src/ElementQueries');
+
+MonacoThemingService.register({
+    id: 'arduino-theme',
+    label: 'Light (Arduino)',
+    uiTheme: 'vs',
+    json: require('../../src/browser/data/arduino.color-theme.json')
+});
+
+export default new ContainerModule((bind, unbind, isBound, rebind) => {
+    ElementQueries.listen();
+    ElementQueries.init();
+
+    // Commands and toolbar items
+    bind(ArduinoFrontendContribution).toSelf().inSingletonScope();
+    bind(CommandContribution).toService(ArduinoFrontendContribution);
+    bind(MenuContribution).toService(ArduinoFrontendContribution);
+    bind(TabBarToolbarContribution).toService(ArduinoFrontendContribution);
+    bind(FrontendApplicationContribution).toService(ArduinoFrontendContribution);
+    bind(ColorContribution).toService(ArduinoFrontendContribution);
+
+    bind(ArduinoToolbarContribution).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(ArduinoToolbarContribution);
+
+    // Renderer for both the library and the core widgets.
+    bind(ListItemRenderer).toSelf().inSingletonScope();
+
+    // Library service
+    bind(LibraryService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, LibraryServicePath)).inSingletonScope();
+
+    // Library list widget
+    bind(LibraryListWidget).toSelf();
+    bindViewContribution(bind, LibraryListWidgetFrontendContribution);
+    bind(WidgetFactory).toDynamicValue(context => ({
+        id: LibraryListWidget.WIDGET_ID,
+        createWidget: () => context.container.get(LibraryListWidget)
+    }));
+    bind(FrontendApplicationContribution).toService(LibraryListWidgetFrontendContribution);
+
+    // Sketch list service
+    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();
+
+    // Boards service
+    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(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');
+
+    // Boards auto-installer
+    bind(BoardsAutoInstaller).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(BoardsAutoInstaller);
+
+    // Boards list widget
+    bind(BoardsListWidget).toSelf();
+    bindViewContribution(bind, BoardsListWidgetFrontendContribution);
+    bind(WidgetFactory).toDynamicValue(context => ({
+        id: BoardsListWidget.WIDGET_ID,
+        createWidget: () => context.container.get(BoardsListWidget)
+    }));
+    bind(FrontendApplicationContribution).toService(BoardsListWidgetFrontendContribution);
+
+    // Board select dialog
+    bind(BoardsConfigDialogWidget).toSelf().inSingletonScope();
+    bind(BoardsConfigDialog).toSelf().inSingletonScope();
+    bind(BoardsConfigDialogProps).toConstantValue({
+        title: 'Select Board'
+    })
+
+    // Core service
+    bind(CoreService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, CoreServicePath)).inSingletonScope();
+
+    // Serial monitor
+    bind(MonitorModel).toSelf().inSingletonScope();
+    bind(FrontendApplicationContribution).toService(MonitorModel);
+    bind(MonitorWidget).toSelf();
+    bindViewContribution(bind, MonitorViewContribution);
+    bind(TabBarToolbarContribution).toService(MonitorViewContribution);
+    bind(WidgetFactory).toDynamicValue(context => ({
+        id: MonitorWidget.ID,
+        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(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(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(TheiaProblemContribution).to(ProblemContribution).inSingletonScope();
+    rebind(TheiaFileNavigatorContribution).to(FileNavigatorContribution).inSingletonScope();
+    rebind(TheiaEditorContribution).to(EditorContribution).inSingletonScope();
+    rebind(TheiaMonacoStatusBarContribution).to(MonacoStatusBarContribution).inSingletonScope();
+    rebind(TheiaApplicationShell).to(ApplicationShell).inSingletonScope();
+    rebind(TheiaScmContribution).to(ScmContribution).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(TheiaKeybindingRegistry).to(KeybindingRegistry).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);
+    });
+    bind(OutputWidget).toSelf().inSingletonScope();
+    rebind(TheiaOutputWidget).toService(OutputWidget);
+    bind(OutputChannelManager).toSelf().inSingletonScope();
+    rebind(TheiaOutputChannelManager).toService(OutputChannelManager);
+    bind(OutputChannelRegistryMainImpl).toSelf().inTransientScope();
+    rebind(TheiaOutputChannelRegistryMainImpl).toService(OutputChannelRegistryMainImpl);
+    bind(MonacoTextModelService).toSelf().inSingletonScope();
+    rebind(TheiaMonacoTextModelService).toService(MonacoTextModelService);
+
+    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);
+    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);
+
+    // Decorator customizations
+    bind(TabBarDecoratorService).toSelf().inSingletonScope();
+    rebind(TheiaTabBarDecoratorService).toService(TabBarDecoratorService);
+
+    // Problem markers
+    bind(ProblemManager).toSelf().inSingletonScope();
+    rebind(TheiaProblemManager).toService(ProblemManager);
+
+    // Customized layout restorer that can restore the state in async way: https://github.com/eclipse-theia/theia/issues/6579
+    bind(ShellLayoutRestorer).toSelf().inSingletonScope();
+    rebind(TheiaShellLayoutRestorer).toService(ShellLayoutRestorer);
+
+    // 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();
+
+    // Examples service@
+    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();
+
+    Contribution.configure(bind, NewSketch);
+    Contribution.configure(bind, OpenSketch);
+    Contribution.configure(bind, Close);
+    Contribution.configure(bind, SaveSketch);
+    Contribution.configure(bind, SaveAsSketch);
+    Contribution.configure(bind, VerifySketch);
+    Contribution.configure(bind, UploadSketch);
+    Contribution.configure(bind, OpenSketchExternal);
+    Contribution.configure(bind, EditContributions);
+    Contribution.configure(bind, QuitApp);
+    Contribution.configure(bind, SketchControl);
+    Contribution.configure(bind, Settings);
+    Contribution.configure(bind, BurnBootloader);
+    Contribution.configure(bind, BuiltInExamples);
+    Contribution.configure(bind, LibraryExamples);
+    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(NotificationCenter).toSelf().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);
+    });
+
+    // Workaround for https://github.com/eclipse-theia/theia/issues/8722
+    // Do not trigger a save on IDE startup if `"editor.autoSave": "on"` was set as a preference.
+    bind(EditorCommandContribution).toSelf().inSingletonScope();
+    rebind(TheiaEditorCommandContribution).toService(EditorCommandContribution);
+
+    // Silent the badge decoration in the Explorer view.
+    bind(NavigatorTabBarDecorator).toSelf().inSingletonScope();
+    rebind(TheiaNavigatorTabBarDecorator).toService(NavigatorTabBarDecorator);
+
+    // 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);
+
+    // 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'
+    });
+});

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

@@ -0,0 +1,74 @@
+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
+        }
+    }
+};
+
+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;
+}
+
+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-theme.ts

@@ -1,29 +0,0 @@
-
-import { Theme } from '@theia/core/lib/browser/theming';
-import { MonacoThemeRegistry } from '@theia/monaco/lib/browser/textmate/monaco-theme-registry';
-
-const ARDUINO_CSS = require('../../src/browser/style/arduino.useable.css');
-const ARDUINO_JSON = MonacoThemeRegistry.SINGLETON.register(
-    require('../../src/browser/data/arduino.color-theme.json'), {}, 'arduino', 'vs').name!;
-
-export class ArduinoTheme {
-
-    static readonly arduino: Theme = {
-        type: 'light',
-        id: 'arduino-theme',
-        label: 'Arduino Light Theme',
-        description: 'Arduino Light Theme',
-        editorTheme: ARDUINO_JSON,
-        activate() {
-            ARDUINO_CSS.use();
-        },
-        deactivate() {
-            ARDUINO_CSS.unuse();
-        }
-    };
-
-    static readonly themes: Theme[] = [
-        ArduinoTheme.arduino
-    ];
-
-}

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

@@ -9,7 +9,7 @@ import { MaybePromise } from '@theia/core/lib/common/types';
  * `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 exists in location?
+ * - `hash` points to an existing location?
  *  - Yes
  *   - `validate location`. Is valid sketch location?
  *    - Yes
@@ -47,7 +47,7 @@ export class ArduinoWorkspaceRootResolver {
     }
 
     protected isValid(uri: string): MaybePromise<boolean> {
-        return this.options.isValid.bind(this)(uri);
+        return this.options.isValid(uri);
     }
 
     // Note: here, the `hash` was defined as new `URI(yourValidFsPath).path` so we have to map it to a valid FS path first.
@@ -59,10 +59,10 @@ export class ArduinoWorkspaceRootResolver {
         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();
+            const path = hash.slice(1); // Trim the leading `#`.
+            return new URI(toUnix(path.slice(isWindows && hash.startsWith('/') ? 1 : 0))).withScheme('file').toString();
         }
         return undefined;
     }
 
-}
+}

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

@@ -1,60 +0,0 @@
-import { injectable, inject } from 'inversify';
-import { LabelProvider } from '@theia/core/lib/browser';
-import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
-import { ConfigService } from '../common/protocol/config-service';
-import { SketchesService } from '../common/protocol/sketches-service';
-import { ArduinoWorkspaceRootResolver } from './arduino-workspace-resolver';
-import { EditorMode } from './editor-mode';
-
-@injectable()
-export class ArduinoWorkspaceService extends WorkspaceService {
-
-    @inject(SketchesService)
-    protected readonly sketchService: SketchesService;
-
-    @inject(ConfigService)
-    protected readonly configService: ConfigService;
-
-    @inject(LabelProvider)
-    protected readonly labelProvider: LabelProvider;
-
-    @inject(EditorMode)
-    protected readonly editorMode: EditorMode;
-
-    async getDefaultWorkspaceUri(): Promise<string | undefined> {
-        const [hash, recentWorkspaces, recentSketches] = await Promise.all([
-            window.location.hash,
-            this.sketchService.getSketches().then(sketches => sketches.map(({ uri }) => uri)),
-            this.server.getRecentWorkspaces()
-        ]);
-        const toOpen = await new ArduinoWorkspaceRootResolver({
-            isValid: this.isValid.bind(this)
-        }).resolve({
-            hash,
-            recentWorkspaces,
-            recentSketches
-        });
-        if (toOpen) {
-            const { uri } = toOpen;
-            await this.server.setMostRecentlyUsedWorkspace(uri);
-            return toOpen.uri;
-        }
-        const { sketchDirUri } = (await this.configService.getConfiguration());
-        return (await this.sketchService.createNewSketch(sketchDirUri)).uri;
-    }
-
-    private async isValid(uri: string): Promise<boolean> {
-        const exists = await this.fileSystem.exists(uri);
-        if (!exists) {
-            return false;
-        }
-        // The workspace root location must exist. However, when opening a workspace root in pro-mode,
-        // the workspace root must not be a sketch folder. It can be the default sketch directory, or any other directories, for instance.
-        if (this.editorMode.proMode) {
-            return true;
-        }
-        const sketchFolder = await this.sketchService.isSketchFolder(uri);
-        return sketchFolder;
-    }
-
-}

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

@@ -1,13 +1,12 @@
 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, Board } from '../../common/protocol/boards-service';
-import { BoardsServiceClientImpl } from './boards-service-client-impl';
+import { BoardsService, BoardsPackage } from '../../common/protocol/boards-service';
+import { BoardsServiceProvider } from './boards-service-provider';
 import { BoardsListWidgetFrontendContribution } from './boards-widget-frontend-contribution';
-import { InstallationProgressDialog } from '../components/progress-dialog';
+import { InstallationProgressDialog } from '../widgets/progress-dialog';
 import { BoardsConfig } from './boards-config';
 
-
 /**
  * Listens on `BoardsConfig.Config` changes, if a board is selected which does not
  * have the corresponding core installed, it proposes the user to install the core.
@@ -21,8 +20,8 @@ export class BoardsAutoInstaller implements FrontendApplicationContribution {
     @inject(BoardsService)
     protected readonly boardsService: BoardsService;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClient: BoardsServiceProvider;
 
     @inject(BoardsListWidgetFrontendContribution)
     protected readonly boardsManagerFrontendContribution: BoardsListWidgetFrontendContribution;
@@ -35,9 +34,9 @@ export class BoardsAutoInstaller implements FrontendApplicationContribution {
     protected ensureCoreExists(config: BoardsConfig.Config): void {
         const { selectedBoard } = config;
         if (selectedBoard) {
-            this.boardsService.search({}).then(({ items }) => {
-                const candidates = items
-                    .filter(item => item.boards.some(board => Board.sameAs(board, 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

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

@@ -4,7 +4,8 @@ import { Emitter } from '@theia/core/lib/common/event';
 import { ReactWidget, Message } from '@theia/core/lib/browser';
 import { BoardsService } from '../../common/protocol/boards-service';
 import { BoardsConfig } from './boards-config';
-import { BoardsServiceClientImpl } from './boards-service-client-impl';
+import { BoardsServiceProvider } from './boards-service-provider';
+import { NotificationCenter } from '../notification-center';
 
 @injectable()
 export class BoardsConfigDialogWidget extends ReactWidget {
@@ -12,9 +13,13 @@ export class BoardsConfigDialogWidget extends ReactWidget {
     @inject(BoardsService)
     protected readonly boardsService: BoardsService;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClient: BoardsServiceProvider;
 
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
+
+    protected readonly onFilterTextDidChangeEmitter = new Emitter<string>();
     protected readonly onBoardConfigChangedEmitter = new Emitter<BoardsConfig.Config>();
     readonly onBoardConfigChanged = this.onBoardConfigChangedEmitter.event;
 
@@ -23,6 +28,14 @@ export class BoardsConfigDialogWidget extends ReactWidget {
     constructor() {
         super();
         this.id = 'select-board-dialog';
+        this.toDispose.pushAll([
+            this.onBoardConfigChangedEmitter,
+            this.onFilterTextDidChangeEmitter
+        ]);
+    }
+
+    search(query: string): void {
+        this.onFilterTextDidChangeEmitter.fire(query);
     }
 
     protected fireConfigChanged = (config: BoardsConfig.Config) => {
@@ -36,10 +49,11 @@ export class BoardsConfigDialogWidget extends ReactWidget {
     protected render(): React.ReactNode {
         return <div className='selectBoardContainer'>
             <BoardsConfig
-                boardsService={this.boardsService}
-                boardsServiceClient={this.boardsServiceClient}
+                boardsServiceProvider={this.boardsServiceClient}
+                notificationCenter={this.notificationCenter}
                 onConfigChange={this.fireConfigChanged}
-                onFocusNodeSet={this.setFocusNode} />
+                onFocusNodeSet={this.setFocusNode}
+                onFilteredTextDidChangeEvent={this.onFilterTextDidChangeEmitter.event} />
         </div>;
     }
 
@@ -51,5 +65,4 @@ export class BoardsConfigDialogWidget extends ReactWidget {
         (this.focusNode || this.node).focus();
     }
 
-
 }

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

@@ -1,10 +1,10 @@
 import { injectable, inject, postConstruct } from 'inversify';
 import { Message } from '@phosphor/messaging';
 import { AbstractDialog, DialogProps, Widget, DialogError } from '@theia/core/lib/browser';
-import { BoardsService } from '../../common/protocol/boards-service';
 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';
-import { BoardsServiceClientImpl } from './boards-service-client-impl';
 
 @injectable()
 export class BoardsConfigDialogProps extends DialogProps {
@@ -19,8 +19,8 @@ export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
     @inject(BoardsService)
     protected readonly boardService: BoardsService;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClient: BoardsServiceProvider;
 
     protected config: BoardsConfig.Config = {};
 
@@ -42,6 +42,16 @@ export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
         }));
     }
 
+    /**
+     * 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> {
+        if (typeof query === 'string') {
+            this.widget.search(query);
+        }
+        return super.open();
+    }
+
     protected createDescription(): HTMLElement {
         const head = document.createElement('div');
         head.classList.add('head');

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

@@ -1,7 +1,11 @@
 import * as React from 'react';
-import { DisposableCollection } from '@theia/core';
-import { BoardsService, Board, Port, AttachedSerialBoard, AttachedBoardsChangeEvent } from '../../common/protocol/boards-service';
-import { BoardsServiceClientImpl } from './boards-service-client-impl';
+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 { NotificationCenter } from '../notification-center';
+import { BoardsServiceProvider } from './boards-service-provider';
 
 export namespace BoardsConfig {
 
@@ -11,16 +15,18 @@ export namespace BoardsConfig {
     }
 
     export interface Props {
-        readonly boardsService: BoardsService;
-        readonly boardsServiceClient: BoardsServiceClientImpl;
+        readonly boardsServiceProvider: BoardsServiceProvider;
+        readonly notificationCenter: NotificationCenter;
         readonly onConfigChange: (config: Config) => void;
         readonly onFocusNodeSet: (element: HTMLElement | undefined) => void;
+        readonly onFilteredTextDidChangeEvent: Event<string>;
     }
 
     export interface State extends Config {
-        searchResults: Array<Board & { packageName: string }>;
+        searchResults: Array<BoardWithPackage>;
         knownPorts: Port[];
         showAllPorts: boolean;
+        query: string;
     }
 
 }
@@ -31,11 +37,11 @@ export abstract class Item<T> extends React.Component<{
     selected: boolean,
     onClick: (item: T) => void,
     missing?: boolean,
-    detail?: string
+    details?: string
 }> {
 
     render(): React.ReactNode {
-        const { selected, label, missing, detail } = this.props;
+        const { selected, label, missing, details } = this.props;
         const classNames = ['item'];
         if (selected) {
             classNames.push('selected');
@@ -43,11 +49,11 @@ export abstract class Item<T> extends React.Component<{
         if (missing === true) {
             classNames.push('missing')
         }
-        return <div onClick={this.onClick} className={classNames.join(' ')} title={`${label}${!detail ? '' : detail}`}>
+        return <div onClick={this.onClick} className={classNames.join(' ')} title={`${label}${!details ? '' : details}`}>
             <div className='label'>
                 {label}
             </div>
-            {!detail ? '' : <div className='detail'>{detail}</div>}
+            {!details ? '' : <div className='details'>{details}</div>}
             {!selected ? '' : <div className='selected-icon'><i className='fa fa-check' /></div>}
         </div>;
     }
@@ -65,24 +71,30 @@ export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConf
     constructor(props: BoardsConfig.Props) {
         super(props);
 
-        const { boardsConfig } = props.boardsServiceClient;
+        const { boardsConfig } = props.boardsServiceProvider;
         this.state = {
             searchResults: [],
             knownPorts: [],
             showAllPorts: false,
+            query: '',
             ...boardsConfig
         }
     }
 
     componentDidMount() {
         this.updateBoards();
-        this.props.boardsService.getAvailablePorts().then(({ ports }) => this.updatePorts(ports));
-        const { boardsServiceClient: client } = this.props;
+        this.updatePorts(this.props.boardsServiceProvider.availableBoards.map(({ port }) => port).filter(notEmpty));
         this.toDispose.pushAll([
-            client.onBoardsChanged(event => this.updatePorts(event.newState.ports, AttachedBoardsChangeEvent.diff(event).detached.ports)),
-            client.onBoardsConfigChanged(({ selectedBoard, selectedPort }) => {
+            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)))
         ]);
     }
 
@@ -96,15 +108,15 @@ export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConf
     }
 
     protected updateBoards = (eventOrQuery: React.ChangeEvent<HTMLInputElement> | string = '') => {
-        const query = (typeof eventOrQuery === 'string'
+        const query = typeof eventOrQuery === 'string'
             ? eventOrQuery
-            : eventOrQuery.target.value.toLowerCase()
-        ).trim();
-        this.queryBoards({ query }).then(({ searchResults }) => this.setState({ searchResults }));
+            : eventOrQuery.target.value.toLowerCase();
+        this.setState({ query });
+        this.queryBoards({ query }).then(searchResults => this.setState({ searchResults }));
     }
 
     protected updatePorts = (ports: Port[] = [], removedPorts: Port[] = []) => {
-        this.queryPorts(Promise.resolve({ ports })).then(({ knownPorts }) => {
+        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))) {
@@ -114,35 +126,17 @@ export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConf
         });
     }
 
-    protected queryBoards = (options: { query?: string } = {}): Promise<{ searchResults: Array<Board & { packageName: string }> }> => {
-        const { boardsService } = this.props;
-        const query = (options.query || '').toLocaleLowerCase();
-        return new Promise<{ searchResults: Array<Board & { packageName: string }> }>(resolve => {
-            boardsService.search(options)
-                .then(({ items }) => items
-                    .map(item => item.boards.map(board => ({ ...board, packageName: item.name })))
-                    .reduce((acc, curr) => acc.concat(curr), [])
-                    .filter(board => board.name.toLocaleLowerCase().indexOf(query) !== -1)
-                    .sort(Board.compare))
-                .then(searchResults => resolve({ searchResults }));
-        });
+    protected queryBoards = (options: { query?: string } = {}): Promise<Array<BoardWithPackage>> => {
+        return this.props.boardsServiceProvider.searchBoards(options);
     }
 
-    protected get attachedBoards(): Promise<{ boards: Board[] }> {
-        return this.props.boardsService.getAttachedBoards();
+    protected get availablePorts(): MaybePromise<Port[]> {
+        return this.props.boardsServiceProvider.availableBoards.map(({ port }) => port).filter(notEmpty);
     }
 
-    protected get availablePorts(): Promise<{ ports: Port[] }> {
-        return this.props.boardsService.getAvailablePorts();
-    }
-
-    protected queryPorts = (availablePorts: Promise<{ ports: Port[] }> = this.availablePorts) => {
-        return new Promise<{ knownPorts: Port[] }>(resolve => {
-            availablePorts
-                .then(({ ports }) => ports
-                    .sort(Port.compare))
-                .then(knownPorts => resolve({ knownPorts }));
-        });
+    protected queryPorts = async (availablePorts: MaybePromise<Port[]> = this.availablePorts) => {
+        const ports = await availablePorts;
+        return { knownPorts: ports.sort(Port.compare) };
     }
 
     protected toggleFilterPorts = () => {
@@ -153,7 +147,7 @@ export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConf
         this.setState({ selectedPort }, () => this.fireConfigChanged());
     }
 
-    protected selectBoard = (selectedBoard: Board & { packageName: string } | undefined) => {
+    protected selectBoard = (selectedBoard: BoardWithPackage | undefined) => {
         this.setState({ selectedBoard }, () => this.fireConfigChanged());
     }
 
@@ -183,42 +177,39 @@ export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConf
     }
 
     protected renderBoards(): React.ReactNode {
-        const { selectedBoard, searchResults } = this.state;
-        // Board names are not unique. We show the corresponding core name as a detail.
-        // https://github.com/arduino/arduino-cli/pull/294#issuecomment-513764948
-        const distinctBoardNames = new Map<string, number>();
-        for (const { name } of searchResults) {
-            const counter = distinctBoardNames.get(name) || 0;
-            distinctBoardNames.set(name, counter + 1);
-        }
-
-        // Due to the non-unique board names, we have to check the package name as well.
-        const selected = (board: Board & { packageName: string }) => {
-            if (!!selectedBoard) {
-                if (Board.equals(board, selectedBoard)) {
-                    if ('packageName' in selectedBoard) {
-                        return board.packageName === (selectedBoard as any).packageName;
-                    }
-                    return true;
-                }
+        const { selectedBoard, searchResults, query } = this.state;
+        // 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 key = toKey(board);
+            if (!distinctBoards.has(key)) {
+                distinctBoards.set(key, board);
             }
-            return false;
         }
 
         return <React.Fragment>
             <div className='search'>
-                <input type='search' placeholder='SEARCH BOARD' onChange={this.updateBoards} ref={this.focusNodeSet} />
+                <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'>
-                {this.state.searchResults.map(board => <Item<Board & { packageName: string }>
+                {Array.from(distinctBoards.values()).map(board => <Item<BoardWithPackage>
                     key={`${board.name}-${board.packageName}`}
                     item={board}
                     label={board.name}
-                    detail={(distinctBoardNames.get(board.name) || 0) > 1 ? ` - ${board.packageName}` : undefined}
-                    selected={selected(board)}
+                    details={board.details}
+                    selected={board.selected}
                     onClick={this.selectBoard}
-                    missing={!Board.installed(board)}
+                    missing={board.missing}
                 />)}
             </div>
         </React.Fragment>;
@@ -266,9 +257,9 @@ export namespace BoardsConfig {
 
     export namespace Config {
 
-        export function sameAs(config: Config, other: Config | AttachedSerialBoard): boolean {
+        export function sameAs(config: Config, other: Config | Board): boolean {
             const { selectedBoard, selectedPort } = config;
-            if (AttachedSerialBoard.is(other)) {
+            if (Board.is(other)) {
                 return !!selectedBoard
                     && Board.equals(other, selectedBoard)
                     && Port.sameAs(selectedPort, other.port);

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

@@ -0,0 +1,101 @@
+import * as PQueue from 'p-queue';
+import { inject, injectable } from 'inversify';
+import { CommandRegistry } from '@theia/core/lib/common/command';
+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, unregisterSubmenu } from '../menu/arduino-menus';
+
+@injectable()
+export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
+
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
+
+    @inject(MenuModelRegistry)
+    protected readonly menuRegistry: MenuModelRegistry;
+
+    @inject(MainMenuManager)
+    protected readonly mainMenuManager: MainMenuManager;
+
+    @inject(BoardsDataStore)
+    protected readonly boardsDataStore: BoardsDataStore;
+
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClient: BoardsServiceProvider;
+
+    protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
+    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));
+    }
+
+    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);
+                    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 }>()
+                            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
+                                };
+                                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(() => 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(() => 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)
+                            };
+                            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))
+                            ]);
+                        }
+                    }
+                    this.mainMenuManager.update();
+                }
+            }
+        });
+    }
+
+}

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

@@ -0,0 +1,211 @@
+import { injectable, inject, named } from 'inversify';
+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 { notEmpty } from '../../common/utils';
+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;
+
+    @inject(BoardsService)
+    protected readonly boardsService: BoardsService;
+
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
+
+    @inject(LocalStorageService)
+    protected readonly storageService: LocalStorageService;
+
+    protected readonly onChangedEmitter = new Emitter<void>();
+
+    onStart(): void {
+        this.notificationCenter.onPlatformInstalled(async ({ item }) => {
+            const { installedVersion: version } = item;
+            if (!version) {
+                return;
+            }
+            let shouldFireChanged = false;
+            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);
+                if (!data || !data.length) {
+                    const details = await this.getBoardDetailsSafe(fqbn);
+                    if (details) {
+                        data = details.configOptions;
+                        if (data.length) {
+                            await this.storageService.setData(key, data);
+                            shouldFireChanged = true;
+                        }
+                    }
+                }
+            }
+            if (shouldFireChanged) {
+                this.fireChanged();
+            }
+        });
+    }
+
+    get onChanged(): Event<void> {
+        return this.onChangedEmitter.event;
+    }
+
+    async appendConfigToFqbn(
+        fqbn: string | undefined,
+        boardsPackageVersion: MaybePromise<Installable.Version | undefined> = this.getBoardsPackageVersion(fqbn)): Promise<string | undefined> {
+
+        if (!fqbn) {
+            return undefined;
+        }
+
+        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> {
+
+        if (!fqbn) {
+            return BoardsDataStore.Data.EMPTY;
+        }
+
+        const version = await boardsPackageVersion;
+        if (!version) {
+            return BoardsDataStore.Data.EMPTY;
+        }
+        const key = this.getStorageKey(fqbn, version);
+        let data = await this.storageService.getData<BoardsDataStore.Data | undefined>(key, undefined);
+        if (BoardsDataStore.Data.is(data)) {
+            return data;
+        }
+
+        const boardDetails = await this.getBoardDetailsSafe(fqbn);
+        if (!boardDetails) {
+            return BoardsDataStore.Data.EMPTY;
+        }
+
+        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> {
+
+        const data = deepClone(await this.getData(fqbn, boardsPackageVersion));
+        const { programmers } = data;
+        if (!programmers.find(p => Programmer.equals(selectedProgrammer, p))) {
+            return false;
+        }
+
+        const version = await boardsPackageVersion;
+        if (!version) {
+            return false;
+        }
+
+        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> {
+
+        const data = deepClone(await this.getData(fqbn, boardsPackageVersion));
+        const { configOptions } = data;
+        const configOption = configOptions.find(c => c.option === option);
+        if (!configOption) {
+            return false;
+        }
+        let updated = false;
+        for (const value of configOption.values) {
+            if (value.value === selectedValue) {
+                (value as any).selected = true;
+                updated = true;
+            } else {
+                (value as any).selected = false;
+            }
+        }
+        if (!updated) {
+            return false;
+        }
+        const version = await boardsPackageVersion;
+        if (!version) {
+            return false;
+        }
+
+        await this.setData({ fqbn, data, version });
+        this.fireChanged();
+        return true;
+    }
+
+    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 `.arduinoIDE-configOptions-${version}-${fqbn}`;
+    }
+
+    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}`);
+            } else {
+                this.logger.error(`An unexpected error occurred while retrieving the board details for ${fqbn}.`, err);
+            }
+            return undefined;
+        }
+    }
+
+    protected fireChanged(): void {
+        this.onChangedEmitter.fire();
+    }
+
+    protected async getBoardsPackageVersion(fqbn: string | undefined): Promise<Installable.Version | undefined> {
+        if (!fqbn) {
+            return undefined;
+        }
+        const boardsPackage = await this.boardsService.getContainerBoardPackage({ fqbn });
+        if (!boardsPackage) {
+            return undefined;
+        }
+        return boardsPackage.installedVersion;
+    }
+
+}
+
+export namespace BoardsDataStore {
+    export interface Data {
+        readonly configOptions: ConfigOption[];
+        readonly programmers: Programmer[];
+        readonly selectedProgrammer?: Programmer;
+    }
+    export namespace Data {
+        export const EMPTY: Data = {
+            configOptions: [],
+            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'])
+        }
+    }
+}

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

@@ -1,17 +1,17 @@
-import { inject, injectable } from 'inversify';
-import { BoardPackage, BoardsService } from '../../common/protocol/boards-service';
-import { ListWidget } from '../components/component-list/list-widget';
-import { ListItemRenderer } from '../components/component-list/list-item-renderer';
+import { inject, injectable, postConstruct } from 'inversify';
+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<BoardPackage> {
+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<BoardPackage>) {
+        @inject(ListItemRenderer) protected itemRenderer: ListItemRenderer<BoardsPackage>) {
 
         super({
             id: BoardsListWidget.WIDGET_ID,
@@ -19,9 +19,18 @@ export class BoardsListWidget extends ListWidget<BoardPackage> {
             iconClass: 'fa fa-microchip',
             searchable: service,
             installable: service,
-            itemLabel: (item: BoardPackage) => item.name,
+            itemLabel: (item: BoardsPackage) => item.name,
             itemRenderer
         });
     }
 
+    @postConstruct()
+    protected init(): void {
+        super.init();
+        this.toDispose.pushAll([
+            this.notificationCenter.onPlatformInstalled(() => this.refresh(undefined)),
+            this.notificationCenter.onPlatformUninstalled(() => this.refresh(undefined)),
+        ]);
+    }
+
 }

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

@@ -1,178 +0,0 @@
-import { injectable, inject } from 'inversify';
-import { Emitter } from '@theia/core/lib/common/event';
-import { ILogger } from '@theia/core/lib/common/logger';
-import { MessageService } from '@theia/core/lib/common/message-service';
-import { LocalStorageService } from '@theia/core/lib/browser/storage-service';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
-import { RecursiveRequired } from '../../common/types';
-import { BoardsServiceClient, AttachedBoardsChangeEvent, BoardInstalledEvent, AttachedSerialBoard, Board, Port, BoardUninstalledEvent } from '../../common/protocol/boards-service';
-import { BoardsConfig } from './boards-config';
-
-@injectable()
-export class BoardsServiceClientImpl implements BoardsServiceClient, FrontendApplicationContribution {
-
-    @inject(ILogger)
-    protected logger: ILogger;
-
-    @inject(MessageService)
-    protected messageService: MessageService;
-
-    @inject(LocalStorageService)
-    protected storageService: LocalStorageService;
-
-    protected readonly onBoardInstalledEmitter = new Emitter<BoardInstalledEvent>();
-    protected readonly onBoardUninstalledEmitter = new Emitter<BoardUninstalledEvent>();
-    protected readonly onAttachedBoardsChangedEmitter = new Emitter<AttachedBoardsChangeEvent>();
-    protected readonly onSelectedBoardsConfigChangedEmitter = new Emitter<BoardsConfig.Config>();
-
-    /**
-     * Used for the auto-reconnecting. Sometimes, the attached board gets disconnected after uploading something to it.
-     * It happens with certain boards on Windows. For example, the `MKR1000` boards is selected on post `COM5` on Windows,
-     * perform an upload, the board automatically disconnects and reconnects, but on another port, `COM10`.
-     * 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 _boardsConfig: BoardsConfig.Config = {};
-
-    readonly onBoardsChanged = this.onAttachedBoardsChangedEmitter.event;
-    readonly onBoardInstalled = this.onBoardInstalledEmitter.event;
-    readonly onBoardUninstalled = this.onBoardUninstalledEmitter.event;
-    readonly onBoardsConfigChanged = this.onSelectedBoardsConfigChangedEmitter.event;
-
-    async onStart(): Promise<void> {
-        return this.loadState();
-    }
-
-    notifyAttachedBoardsChanged(event: AttachedBoardsChangeEvent): void {
-        this.logger.info('Attached boards and available ports changed: ', JSON.stringify(event));
-        const { detached, attached } = AttachedBoardsChangeEvent.diff(event);
-        const { selectedPort, selectedBoard } = this.boardsConfig;
-        this.onAttachedBoardsChangedEmitter.fire(event);
-        // Dynamically unset the port if is not available anymore. A port can be "detached" when removing a board.
-        if (detached.ports.some(port => Port.equals(selectedPort, port))) {
-            this.boardsConfig = {
-                selectedBoard,
-                selectedPort: undefined
-            };
-        }
-        // Try to reconnect.
-        this.tryReconnect(attached.boards, attached.ports);
-    }
-
-    async tryReconnect(attachedBoards: Board[], availablePorts: Port[]): Promise<boolean> {
-        if (this.latestValidBoardsConfig && !this.canUploadTo(this.boardsConfig)) {
-            for (const board of attachedBoards.filter(AttachedSerialBoard.is)) {
-                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 attachedBoards.filter(AttachedSerialBoard.is)) {
-                if (this.latestValidBoardsConfig.selectedBoard.fqbn === board.fqbn
-                    && this.latestValidBoardsConfig.selectedBoard.name === board.name) {
-
-                    this.boardsConfig = {
-                        ...this.latestValidBoardsConfig,
-                        selectedPort: availablePorts.find(port => Port.sameAs(port, board.port))
-                    };
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    notifyBoardInstalled(event: BoardInstalledEvent): void {
-        this.logger.info('Board installed: ', JSON.stringify(event));
-        this.onBoardInstalledEmitter.fire(event);
-    }
-
-    notifyBoardUninstalled(event: BoardUninstalledEvent): void {
-        this.logger.info('Board uninstalled: ', JSON.stringify(event));
-        this.onBoardUninstalledEmitter.fire(event);
-    }
-
-    set boardsConfig(config: BoardsConfig.Config) {
-        this.logger.info('Board config changed: ', JSON.stringify(config));
-        this._boardsConfig = config;
-        if (this.canUploadTo(this._boardsConfig)) {
-            this.latestValidBoardsConfig = this._boardsConfig;
-        }
-        this.saveState().then(() => this.onSelectedBoardsConfigChangedEmitter.fire(this._boardsConfig));
-    }
-
-    get boardsConfig(): BoardsConfig.Config {
-        return this._boardsConfig;
-    }
-
-    /**
-     * `true` if the `config.selectedBoard` is defined; hence can compile against the board. Otherwise, `false`.
-     */
-    canVerify(
-        config: BoardsConfig.Config | undefined = this.boardsConfig,
-        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 });
-            }
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * `true` if the `canVerify` and the `config.selectedPort` is also set with FQBN, hence can upload to board. Otherwise, `false`.
-     */
-    canUploadTo(
-        config: BoardsConfig.Config | undefined = this.boardsConfig,
-        options: { silent: boolean } = { silent: true }): config is RecursiveRequired<BoardsConfig.Config> {
-
-        if (!this.canVerify(config, options)) {
-            return false;
-        }
-
-        const { name } = config.selectedBoard;
-        if (!config.selectedPort) {
-            if (!options.silent) {
-                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 });
-            }
-            return false;
-        }
-
-        return true;
-    }
-
-    protected saveState(): Promise<void> {
-        return this.storageService.setData('latest-valid-boards-config', this.latestValidBoardsConfig);
-    }
-
-    protected async loadState(): Promise<void> {
-        const storedValidBoardsConfig = await this.storageService.getData<RecursiveRequired<BoardsConfig.Config>>('latest-valid-boards-config');
-        if (storedValidBoardsConfig) {
-            this.latestValidBoardsConfig = storedValidBoardsConfig;
-            if (this.canUploadTo(this.latestValidBoardsConfig)) {
-                this.boardsConfig = this.latestValidBoardsConfig;
-            }
-        }
-    }
-
-}

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

@@ -0,0 +1,463 @@
+import { injectable, inject } from 'inversify';
+import { Emitter } from '@theia/core/lib/common/event';
+import { ILogger } from '@theia/core/lib/common/logger';
+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 {
+    Port,
+    Board,
+    BoardsService,
+    BoardsPackage,
+    AttachedBoardsChangeEvent,
+    BoardWithPackage
+} from '../../common/protocol';
+import { BoardsConfig } from './boards-config';
+import { naturalCompare } from '../../common/utils';
+import { NotificationCenter } from '../notification-center';
+import { CommandService } from '@theia/core';
+import { ArduinoCommands } from '../arduino-commands';
+
+@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;
+
+    @inject(CommandService)
+    protected commandService: CommandService;
+
+    @inject(NotificationCenter)
+    protected notificationCenter: NotificationCenter;
+
+    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.
+     * It happens with certain boards on Windows. For example, the `MKR1000` boards is selected on post `COM5` on Windows,
+     * perform an upload, the board automatically disconnects and reconnects, but on another port, `COM10`.
+     * 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 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[] = [];
+    protected _availableBoards: AvailableBoard[] = [];
+
+    /**
+     * Unlike `onAttachedBoardsChanged` this even fires when the user modifies the selected board in the IDE.\
+     * This even also fires, when the boards package was not available for the currently selected board,
+     * and the user installs the board package. Note: installing a board package will set the `fqbn` of the
+     * currently selected board.\
+     * 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;
+
+    onStart(): void {
+        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()
+        ]).then(([attachedBoards, availablePorts]) => {
+            this._attachedBoards = attachedBoards;
+            this._availablePorts = availablePorts;
+            this.reconcileAvailableBoards().then(() => this.tryReconnect());
+        });
+    }
+
+    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._attachedBoards = event.newState.boards;
+        this._availablePorts = event.newState.ports;
+        this.reconcileAvailableBoards().then(() => this.tryReconnect());
+    }
+
+    protected notifyPlatformInstalled(event: { item: BoardsPackage }): void {
+        this.logger.info('Boards package installed: ', JSON.stringify(event));
+        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}]`);
+                this.boardsConfig = {
+                    ...this.boardsConfig,
+                    selectedBoard: installedBoard
+                };
+                return;
+            }
+            // The board name can change after install.
+            // 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 = {}
+                return;
+            }
+            // Trigger a board re-set. See: https://github.com/arduino/arduino-cli/issues/954
+            // E.g: install `adafruit:avr`, then select `adafruit:avr:adafruit32u4` board, and finally install the required `arduino:avr`
+            this.boardsConfig = this.boardsConfig;
+        }
+    }
+
+    protected notifyPlatformUninstalled(event: { item: BoardsPackage }): void {
+        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) {
+                // 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
+                    // No FQBN
+                };
+                this.boardsConfig = {
+                    ...this.boardsConfig,
+                    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)) {
+
+                    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) {
+
+                    this.boardsConfig = {
+                        ...this.latestValidBoardsConfig,
+                        selectedPort: board.port
+                    };
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    set boardsConfig(config: BoardsConfig.Config) {
+        this.doSetBoardsConfig(config);
+        this.saveState().finally(() => this.reconcileAvailableBoards().finally(() => this.onBoardsConfigChangedEmitter.fire(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<BoardWithPackage[]> {
+        const boards = await this.boardsService.searchBoards({ query });
+        return boards;
+    }
+
+    get boardsConfig(): BoardsConfig.Config {
+        return this._boardsConfig;
+    }
+
+    /**
+     * `true` if the `config.selectedBoard` is defined; hence can compile against the board. Otherwise, `false`.
+     */
+    canVerify(
+        config: BoardsConfig.Config | undefined = this.boardsConfig,
+        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 });
+            }
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * `true` if `canVerify`, the board has an FQBN and the `config.selectedPort` is also set, hence can upload to board. Otherwise, `false`.
+     */
+    canUploadTo(
+        config: BoardsConfig.Config | undefined = this.boardsConfig,
+        options: { silent: boolean } = { silent: true }): config is RecursiveRequired<BoardsConfig.Config> {
+
+        if (!this.canVerify(config, options)) {
+            return false;
+        }
+
+        const { name } = config.selectedBoard;
+        if (!config.selectedPort) {
+            if (!options.silent) {
+                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 });
+            }
+            return false;
+        }
+
+        return true;
+    }
+
+    get availableBoards(): AvailableBoard[] {
+        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 => {
+            let candidate = find(what, this.availableBoards);
+            if (candidate) {
+                resolve();
+                return;
+            }
+            const disposable = this.onAvailableBoardsChanged(availableBoards => {
+                candidate = find(what, availableBoards);
+                if (candidate) {
+                    disposable.dispose();
+                    resolve();
+                }
+            });
+        });
+        return await Promise.race([waitUntilTask, timeoutTask]);
+    }
+
+    protected async reconcileAvailableBoards(): Promise<void> {
+        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 });
+            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);
+
+        for (const boardPort of availableBoardPorts) {
+            let state = AvailableBoard.State.incomplete; // Initial pessimism.
+            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);
+                if (lastSelectedBoard) {
+                    board = {
+                        ...lastSelectedBoard,
+                        port: boardPort
+                    };
+                    state = AvailableBoard.State.guessed;
+                }
+            }
+            if (!board) {
+                availableBoards.push({ name: 'Unknown', port: boardPort, state });
+            } else {
+                const selected = BoardsConfig.Config.sameAs(boardsConfig, board);
+                availableBoards.push({ ...board, state, selected, port: boardPort });
+            }
+        }
+
+        if (boardsConfig.selectedBoard && !availableBoards.some(({ selected }) => selected)) {
+            availableBoards.push({
+                ...boardsConfig.selectedBoard,
+                port: boardsConfig.selectedPort,
+                selected: true,
+                state: AvailableBoard.State.incomplete
+            });
+        }
+
+        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;
+        }
+        if (hasChanged) {
+            this._availableBoards = sortedAvailableBoards;
+            this.onAvailableBoardsChangedEmitter.fire(this._availableBoards);
+        }
+    }
+
+    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);
+    }
+
+    protected async saveState(): Promise<void> {
+        // We save the port with the selected board name/FQBN, to be able to guess a better board name.
+        // Required when the attached board belongs to a 3rd party boards package, and neither the name, nor
+        // the FQBN can be retrieved with a `board list` command.
+        // https://github.com/arduino/arduino-cli/issues/623
+        const { selectedBoard, selectedPort } = this.boardsConfig;
+        if (selectedBoard && selectedPort) {
+            const key = this.getLastSelectedBoardOnPortKey(selectedPort);
+            await this.storageService.setData(key, selectedBoard);
+        }
+        await Promise.all([
+            this.storageService.setData('latest-valid-boards-config', this.latestValidBoardsConfig),
+            this.storageService.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)}`;
+    }
+
+    protected async loadState(): Promise<void> {
+        const storedLatestValidBoardsConfig = await this.storageService.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.
+            const storedLatestBoardsConfig = await this.storageService.getData<BoardsConfig.Config | undefined>('latest-boards-config');
+            if (storedLatestBoardsConfig) {
+                this.latestBoardsConfig = storedLatestBoardsConfig;
+                this.boardsConfig = this.latestBoardsConfig;
+            }
+        }
+    }
+}
+
+/**
+ * Representation of a ready-to-use board, either the user has configured it or was automatically recognized by the CLI.
+ * An available board was not necessarily recognized by the CLI (e.g.: it is a 3rd party board) or correctly configured but ready for `verify`.
+ * If it has the selected board and a associated port, it can be used for `upload`. We render an available board for the user
+ * when it has the `port` set.
+ */
+export interface AvailableBoard extends Board {
+    readonly state: AvailableBoard.State;
+    readonly selected?: boolean;
+    readonly port?: Port;
+}
+
+export namespace AvailableBoard {
+
+    export enum State {
+        /**
+         * Retrieved from the CLI via the `board list` command.
+         */
+        'recognized',
+        /**
+         * Guessed the name/FQBN of the board from the available board ports (3rd party).
+         */
+        'guessed',
+        /**
+         * We do not know anything about this board, probably a 3rd party. The user has not selected a board for this port yet.
+         */
+        '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 } {
+        return !!board.port;
+    }
+
+    export const compare = (left: AvailableBoard, right: AvailableBoard) => {
+        if (left.selected && !right.selected) {
+            return -1;
+        }
+        if (right.selected && !left.selected) {
+            return 1;
+        }
+        let result = naturalCompare(left.name, right.name);
+        if (result !== 0) {
+            return result;
+        }
+        if (left.fqbn && right.fqbn) {
+            result = naturalCompare(left.fqbn, right.fqbn);
+            if (result !== 0) {
+                return result;
+            }
+        }
+        if (left.port && right.port) {
+            result = Port.compare(left.port, right.port);
+            if (result !== 0) {
+                return result;
+            }
+        }
+        if (!!left.selected && !right.selected) {
+            return -1;
+        }
+        if (!!right.selected && !left.selected) {
+            return 1;
+        }
+        return left.state - right.state;
+    }
+
+}

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

@@ -1,10 +1,11 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { CommandRegistry, DisposableCollection } from '@theia/core';
-import { BoardsService, Board, AttachedSerialBoard, Port } from '../../common/protocol/boards-service';
-import { ArduinoCommands } from '../arduino-commands';
-import { BoardsServiceClientImpl } from './boards-service-client-impl';
+import { CommandRegistry } from '@theia/core/lib/common/command';
+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';
 
 export interface BoardsDropDownListCoords {
     readonly top: number;
@@ -16,14 +17,9 @@ export interface BoardsDropDownListCoords {
 export namespace BoardsDropDown {
     export interface Props {
         readonly coords: BoardsDropDownListCoords | 'hidden';
-        readonly items: Item[];
+        readonly items: Array<AvailableBoard & { onClick: () => void, port: Port }>;
         readonly openBoardsConfig: () => void;
     }
-    export interface Item {
-        readonly label: string;
-        readonly selected: boolean;
-        readonly onClick: () => void;
-    }
 }
 
 export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
@@ -51,48 +47,30 @@ export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
         if (coords === 'hidden') {
             return '';
         }
-        items.push({
-            label: 'Select Other Board & Port',
-            selected: false,
-            onClick: () => this.props.openBoardsConfig()
-        })
         return <div className='arduino-boards-dropdown-list'
             style={{
                 position: 'absolute',
                 ...coords
             }}>
-            {items.map(this.renderItem)}
+            {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(item: BoardsDropDown.Item): React.ReactNode {
-        const { label, selected, onClick } = item;
+    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'/> : ''}
+            {selected ? <span className='fa fa-check' /> : ''}
         </div>
     }
 
 }
 
-export namespace BoardsToolBarItem {
-
-    export interface Props {
-        readonly boardService: BoardsService;
-        readonly boardsServiceClient: BoardsServiceClientImpl;
-        readonly commands: CommandRegistry;
-    }
-
-    export interface State {
-        boardsConfig: BoardsConfig.Config;
-        attachedBoards: Board[];
-        availablePorts: Port[];
-        coords: BoardsDropDownListCoords | 'hidden';
-    }
-}
-
 export class BoardsToolBarItem extends React.Component<BoardsToolBarItem.Props, BoardsToolBarItem.State> {
 
     static TOOLBAR_ID: 'boards-toolbar';
@@ -102,10 +80,9 @@ export class BoardsToolBarItem extends React.Component<BoardsToolBarItem.Props,
     constructor(props: BoardsToolBarItem.Props) {
         super(props);
 
+        const { availableBoards } = props.boardsServiceClient;
         this.state = {
-            boardsConfig: this.props.boardsServiceClient.boardsConfig,
-            attachedBoards: [],
-            availablePorts: [],
+            availableBoards,
             coords: 'hidden'
         };
 
@@ -115,17 +92,7 @@ export class BoardsToolBarItem extends React.Component<BoardsToolBarItem.Props,
     }
 
     componentDidMount() {
-        const { boardsServiceClient: client, boardService } = this.props;
-        this.toDispose.pushAll([
-            client.onBoardsConfigChanged(boardsConfig => this.setState({ boardsConfig })),
-            client.onBoardsChanged(({ newState }) => this.setState({ attachedBoards: newState.boards, availablePorts: newState.ports }))
-        ]);
-        Promise.all([
-            boardService.getAttachedBoards(),
-            boardService.getAvailablePorts()
-        ]).then(([{boards: attachedBoards}, { ports: availablePorts }]) => {
-            this.setState({ attachedBoards, availablePorts })
-        });
+        this.props.boardsServiceClient.onAvailableBoardsChanged(availableBoards => this.setState({ availableBoards }));
     }
 
     componentWillUnmount(): void {
@@ -146,7 +113,7 @@ export class BoardsToolBarItem extends React.Component<BoardsToolBarItem.Props,
                     }
                 });
             } else {
-                this.setState({ coords: 'hidden'});
+                this.setState({ coords: 'hidden' });
             }
         }
         event.stopPropagation();
@@ -154,41 +121,52 @@ export class BoardsToolBarItem extends React.Component<BoardsToolBarItem.Props,
     };
 
     render(): React.ReactNode {
-        const { boardsConfig, coords, attachedBoards, availablePorts } = this.state;
+        const { coords, availableBoards } = this.state;
+        const boardsConfig = this.props.boardsServiceClient.boardsConfig;
         const title = BoardsConfig.Config.toString(boardsConfig, { default: 'no board selected' });
-        const configuredBoard = attachedBoards
-            .filter(AttachedSerialBoard.is)
-            .filter(board => availablePorts.some(port => Port.sameAs(port, board.port)))
-            .filter(board => BoardsConfig.Config.sameAs(boardsConfig, board)).shift();
-
-        const items = attachedBoards.filter(AttachedSerialBoard.is).map(board => ({
-            label: `${board.name} at ${board.port}`,
-            selected: configuredBoard === board,
-            onClick: () => {
-                this.props.boardsServiceClient.boardsConfig = {
-                    selectedBoard: board,
-                    selectedPort: availablePorts.find(port => Port.sameAs(port, board.port))
-                }
+        const decorator = (() => {
+            const selectedBoard = availableBoards.find(({ selected }) => selected);
+            if (!selectedBoard || !selectedBoard.port) {
+                return 'fa fa-times notAttached'
             }
-        }));
+            if (selectedBoard.state === AvailableBoard.State.guessed) {
+                return 'fa fa-exclamation-triangle guessed'
+            }
+            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={!configuredBoard ? 'fa fa-times notAttached' : ''}/>
+                        <span className={decorator} />
                         <div className='label noWrapInfo'>
                             <div className='noWrapInfo noselect'>
                                 {title}
                             </div>
                         </div>
-                        <span className='fa fa-caret-down caret'/>
+                        <span className='fa fa-caret-down caret' />
                     </div>
                 </div>
             </div>
             <BoardsDropDown
                 coords={coords}
-                items={items}
+                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>;
@@ -200,3 +178,16 @@ export class BoardsToolBarItem extends React.Component<BoardsToolBarItem.Props,
     };
 
 }
+export namespace BoardsToolBarItem {
+
+    export interface Props {
+        readonly boardsServiceClient: BoardsServiceProvider;
+        readonly commands: CommandRegistry;
+    }
+
+    export interface State {
+        availableBoards: AvailableBoard[];
+        coords: BoardsDropDownListCoords | 'hidden';
+    }
+
+}

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

@@ -1,14 +1,10 @@
 import { injectable } from 'inversify';
-import { MenuModelRegistry } from '@theia/core';
 import { BoardsListWidget } from './boards-list-widget';
-import { ArduinoMenus } from '../arduino-frontend-contribution';
-import { BoardPackage } from '../../common/protocol/boards-service';
-import { ListWidgetFrontendContribution } from '../components/component-list/list-widget-frontend-contribution';
+import { BoardsPackage } from '../../common/protocol/boards-service';
+import { ListWidgetFrontendContribution } from '../widgets/component-list/list-widget-frontend-contribution';
 
 @injectable()
-export class BoardsListWidgetFrontendContribution extends ListWidgetFrontendContribution<BoardPackage> {
-
-    static readonly OPEN_MANAGER = `${BoardsListWidget.WIDGET_ID}:toggle`;
+export class BoardsListWidgetFrontendContribution extends ListWidgetFrontendContribution<BoardsPackage> {
 
     constructor() {
         super({
@@ -16,20 +12,15 @@ export class BoardsListWidgetFrontendContribution extends ListWidgetFrontendCont
             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'
         });
     }
 
-    registerMenus(menus: MenuModelRegistry): void {
-        if (this.toggleCommand) {
-            menus.registerMenuAction(ArduinoMenus.TOOLS, {
-                commandId: this.toggleCommand.id,
-                label: 'Boards Manager...'
-            });
-        }
+    async initializeLayout(): Promise<void> {
+        this.openView();
     }
 
 }

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

@@ -0,0 +1,105 @@
+import { inject, injectable } from 'inversify';
+import * as moment from 'moment';
+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 { ArduinoMenus } from '../menu/arduino-menus';
+import { ConfigService } from '../../common/protocol';
+
+@injectable()
+export class About extends Contribution {
+
+    @inject(ClipboardService)
+    protected readonly clipboardService: ClipboardService;
+
+    @inject(ConfigService)
+    protected readonly configService: ConfigService;
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(About.Commands.ABOUT_APP, {
+            execute: () => this.showAbout()
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.HELP__ABOUT_GROUP, {
+            commandId: About.Commands.ABOUT_APP.id,
+            label: `About ${this.applicationName}`,
+            order: '0'
+        });
+    }
+
+    async showAbout(): Promise<void> {
+        const { version, commit, status: cliStatus } = await this.configService.getVersion();
+        const buildDate = this.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}]
+
+${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}`,
+            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).trim());
+        }
+    }
+
+    protected get applicationName(): string {
+        return FrontendApplicationConfigProvider.get().applicationName;
+    }
+
+    protected get buildDate(): string | undefined {
+        return FrontendApplicationConfigProvider.get().buildDate;
+    }
+
+    protected ago(isoTime: string): string {
+        const now = moment(Date.now());
+        const other = moment(isoTime);
+        let result = now.diff(other, 'minute');
+        if (result < 60) {
+            return result === 1 ? `${result} minute ago` : `${result} minute ago`;
+        }
+        result = now.diff(other, 'hour');
+        if (result < 25) {
+            return result === 1 ? `${result} hour ago` : `${result} hours ago`;
+        }
+        result = now.diff(other, 'day');
+        if (result < 8) {
+            return result === 1 ? `${result} day ago` : `${result} days ago`;
+        }
+        result = now.diff(other, 'week');
+        if (result < 5) {
+            return result === 1 ? `${result} week ago` : `${result} weeks ago`;
+        }
+        result = now.diff(other, 'month');
+        if (result < 13) {
+            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'
+        };
+    }
+}

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

@@ -0,0 +1,68 @@
+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,113 @@
+import { inject, injectable } from 'inversify';
+import { remote } from 'electron';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import { SketchContribution, Command, CommandRegistry, MenuModelRegistry } from './contribution';
+import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
+import URI from '@theia/core/lib/common/uri';
+import { InstallationProgressDialog } from '../widgets/progress-dialog';
+import { LibraryService } from '../../common/protocol';
+import { ConfirmDialog } from '@theia/core/lib/browser';
+
+@injectable()
+export class AddZipLibrary extends SketchContribution {
+
+    @inject(EnvVariablesServer)
+    protected readonly envVariableServer: EnvVariablesServer;
+
+    @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> {
+        const dialog = new InstallationProgressDialog('Installing library', 'zip');
+        try {
+            this.outputChannelManager.getChannel('Arduino').clear();
+            dialog.open();
+            await this.libraryService.installZip({ zipUri, overwrite });
+        } 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;
+        } finally {
+            dialog.close();
+        }
+    }
+
+}
+
+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,55 @@
+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,222 @@
+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

@@ -0,0 +1,82 @@
+import { inject, injectable } from 'inversify';
+import { OutputChannelManager } from '@theia/output/lib/common/output-channel';
+import { CoreService } from '../../common/protocol';
+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';
+
+@injectable()
+export class BurnBootloader extends SketchContribution {
+
+    @inject(CoreService)
+    protected readonly coreService: CoreService;
+
+    @inject(MonitorConnection)
+    protected readonly monitorConnection: MonitorConnection;
+
+    @inject(BoardsDataStore)
+    protected readonly boardsDataStore: BoardsDataStore;
+
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClientImpl: BoardsServiceProvider;
+
+    @inject(OutputChannelManager)
+    protected readonly outputChannelManager: OutputChannelManager;
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(BurnBootloader.Commands.BURN_BOOTLOADER, {
+            execute: () => this.burnBootloader()
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.TOOLS__BOARD_SETTINGS_GROUP, {
+            commandId: BurnBootloader.Commands.BURN_BOOTLOADER.id,
+            label: 'Burn Bootloader',
+            order: 'z99'
+        });
+    }
+
+    async burnBootloader(): Promise<void> {
+        const monitorConfig = this.monitorConnection.monitorConfig;
+        if (monitorConfig) {
+            await this.monitorConnection.disconnect();
+        }
+        try {
+            const { boardsConfig } = this.boardsServiceClientImpl;
+            const port = boardsConfig.selectedPort?.address;
+            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,
+                verify,
+                verbose
+            });
+            this.messageService.info('Done burning bootloader.', { timeout: 1000 });
+        } catch (e) {
+            this.messageService.error(e.toString());
+        } finally {
+            if (monitorConfig) {
+                await this.monitorConnection.connect(monitorConfig);
+            }
+        }
+    }
+
+}
+
+export namespace BurnBootloader {
+    export namespace Commands {
+        export const BURN_BOOTLOADER: Command = {
+            id: 'arduino-burn-bootloader'
+        };
+    }
+}

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

@@ -0,0 +1,119 @@
+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

@@ -0,0 +1,122 @@
+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 { 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 { ArduinoPreferences } from '../arduino-preferences';
+
+export { Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, TabBarToolbarRegistry, URI, Sketch, open };
+
+@injectable()
+export abstract class Contribution implements CommandContribution, MenuContribution, KeybindingContribution, TabBarToolbarContribution, FrontendApplicationContribution {
+
+    @inject(ILogger)
+    protected readonly logger: ILogger;
+
+    @inject(MessageService)
+    protected readonly messageService: MessageService;
+
+    @inject(CommandService)
+    protected readonly commandService: CommandService;
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    @inject(EditorMode)
+    protected readonly editorMode: EditorMode;
+
+    @inject(LabelProvider)
+    protected readonly labelProvider: LabelProvider;
+
+    @inject(SettingsService)
+    protected readonly settingsService: SettingsService;
+
+    onStart(app: FrontendApplication): MaybePromise<void> {
+    }
+
+    registerCommands(registry: CommandRegistry): void {
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+    }
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+    }
+
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+    }
+
+}
+
+@injectable()
+export abstract class SketchContribution extends Contribution {
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    @inject(FileSystemExt)
+    protected readonly fileSystemExt: FileSystemExt;
+
+    @inject(ConfigService)
+    protected readonly configService: ConfigService;
+
+    @inject(SketchesService)
+    protected readonly sketchService: SketchesService;
+
+    @inject(OpenerService)
+    protected readonly openerService: OpenerService;
+
+    @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 {
+        bind(serviceIdentifier).toSelf().inSingletonScope();
+        bind(CommandContribution).toService(serviceIdentifier);
+        bind(MenuContribution).toService(serviceIdentifier);
+        bind(KeybindingContribution).toService(serviceIdentifier);
+        bind(TabBarToolbarContribution).toService(serviceIdentifier);
+        bind(FrontendApplicationContribution).toService(serviceIdentifier);
+    }
+}

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

@@ -0,0 +1,137 @@
+import { inject, injectable } from 'inversify';
+import { Event, Emitter } from '@theia/core/lib/common/event';
+import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin';
+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';
+
+@injectable()
+export class Debug extends SketchContribution {
+
+    @inject(HostedPluginSupport)
+    protected hostedPluginSupport: HostedPluginSupport;
+
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
+
+    @inject(ExecutableService)
+    protected readonly executableService: ExecutableService;
+
+    @inject(BoardsService)
+    protected readonly boardService: BoardsService;
+
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceProvider: BoardsServiceProvider;
+
+    /**
+     * 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 get disabledMessage(): string | undefined {
+        return this._disabledMessages;
+    }
+    protected set disabledMessage(message: string | undefined) {
+        this._disabledMessages = message;
+        this.disabledMessageDidChangeEmitter.fire(this._disabledMessages);
+    }
+
+    protected readonly debugToolbarItem = {
+        id: Debug.Commands.START_DEBUGGING.id,
+        command: Debug.Commands.START_DEBUGGING.id,
+        tooltip: `${this.disabledMessage ? `Debug - ${this.disabledMessage}` : 'Start Debugging'}`,
+        priority: 3,
+        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) => {
+            if (!board) {
+                this.disabledMessage = 'No board selected';
+                return;
+            }
+            const fqbn = board.fqbn;
+            if (!fqbn) {
+                this.disabledMessage = `Platform is not installed for '${board.name}'`;
+                return;
+            }
+            const details = await this.boardService.getBoardDetails({ fqbn });
+            if (!details) {
+                this.disabledMessage = `Platform is not installed for '${board.name}'`;
+                return;
+            }
+            const { debuggingSupported } = details;
+            if (!debuggingSupported) {
+                this.disabledMessage = `Debugging is not supported by '${board.name}'`;
+            } else {
+                this.disabledMessage = undefined;
+            }
+        }
+        this.boardsServiceProvider.onBoardsConfigChanged(({ selectedBoard }) => refreshState(selectedBoard));
+        this.notificationCenter.onPlatformInstalled(() => refreshState());
+        this.notificationCenter.onPlatformUninstalled(() => refreshState());
+        refreshState();
+    }
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(Debug.Commands.START_DEBUGGING, {
+            execute: () => this.startDebug(),
+            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
+            isEnabled: () => !this.disabledMessage
+        });
+    }
+
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+        registry.registerItem(this.debugToolbarItem);
+    }
+
+    protected async startDebug(board: Board | undefined = this.boardsServiceProvider.boardsConfig.selectedBoard): Promise<void> {
+        if (!board) {
+            return;
+        }
+        const { name, fqbn } = board;
+        if (!fqbn) {
+            return;
+        }
+        await this.hostedPluginSupport.didStart;
+        const [sketch, executables] = await Promise.all([
+            this.sketchServiceClient.currentSketch(),
+            this.executableService.list()
+        ]);
+        if (!sketch) {
+            return;
+        }
+        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(ideTempFolderUri)),
+        ])
+        const config = {
+            cliPath,
+            board: {
+                fqbn,
+                name
+            },
+            sketchPath,
+            configPath
+        };
+        return this.commandService.executeCommand('arduino.debug.start', config);
+    }
+
+}
+
+export namespace Debug {
+    export namespace Commands {
+        export const START_DEBUGGING: Command = {
+            id: 'arduino-start-debug',
+            label: 'Start Debugging',
+            category: 'Arduino'
+        }
+    }
+}

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

@@ -0,0 +1,294 @@
+import { inject, injectable } from 'inversify';
+import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribution';
+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 { 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;
+
+    @inject(ClipboardService)
+    protected readonly clipboardService: ClipboardService;
+
+    @inject(PreferenceService)
+    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: 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]`)
+                }
+            }
+        });
+        registry.registerCommand(EditContributions.Commands.COPY_FOR_GITHUB, {
+            execute: async () => {
+                const value = await this.currentValue();
+                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'
+        });
+        registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
+            commandId: CommonCommands.COPY.id,
+            order: '1'
+        });
+        registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
+            commandId: EditContributions.Commands.COPY_FOR_FORUM.id,
+            label: 'Copy for Forum',
+            order: '2'
+        });
+        registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
+            commandId: EditContributions.Commands.COPY_FOR_GITHUB.id,
+            label: 'Copy for GitHub',
+            order: '3'
+        });
+        registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
+            commandId: CommonCommands.PASTE.id,
+            order: '4'
+        });
+        registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
+            commandId: CommonCommands.SELECT_ALL.id,
+            order: '5'
+        });
+        registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
+            commandId: EditContributions.Commands.GO_TO_LINE.id,
+            label: 'Go to Line...',
+            order: '6'
+        });
+
+        registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
+            commandId: EditContributions.Commands.TOGGLE_COMMENT.id,
+            label: 'Comment/Uncomment',
+            order: '0'
+        });
+        registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
+            commandId: EditContributions.Commands.INDENT_LINES.id,
+            label: 'Increase Indent',
+            order: '1'
+        });
+        registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
+            commandId: EditContributions.Commands.OUTDENT_LINES.id,
+            label: 'Decrease Indent',
+            order: '2'
+        });
+
+        registry.registerMenuAction(ArduinoMenus.EDIT__FONT_CONTROL_GROUP, {
+            commandId: EditContributions.Commands.INCREASE_FONT_SIZE.id,
+            label: 'Increase Font Size',
+            order: '0'
+        });
+        registry.registerMenuAction(ArduinoMenus.EDIT__FONT_CONTROL_GROUP, {
+            commandId: EditContributions.Commands.DECREASE_FONT_SIZE.id,
+            label: 'Decrease Font Size',
+            order: '1'
+        });
+
+        registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
+            commandId: EditContributions.Commands.FIND.id,
+            label: 'Find',
+            order: '0'
+        });
+        registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
+            commandId: EditContributions.Commands.FIND_NEXT.id,
+            label: 'Find Next',
+            order: '1'
+        });
+        registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
+            commandId: EditContributions.Commands.FIND_PREVIOUS.id,
+            label: 'Find Previous',
+            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'
+        });
+
+        // `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'
+        });
+    }
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybinding({
+            command: EditContributions.Commands.COPY_FOR_FORUM.id,
+            keybinding: 'CtrlCmd+Shift+C',
+            when: 'editorFocus'
+        });
+        registry.registerKeybinding({
+            command: EditContributions.Commands.COPY_FOR_GITHUB.id,
+            keybinding: 'CtrlCmd+Alt+C',
+            when: 'editorFocus'
+        });
+        registry.registerKeybinding({
+            command: EditContributions.Commands.GO_TO_LINE.id,
+            keybinding: 'CtrlCmd+L',
+            when: 'editorFocus'
+        });
+
+        registry.registerKeybinding({
+            command: EditContributions.Commands.TOGGLE_COMMENT.id,
+            keybinding: 'CtrlCmd+/',
+            when: 'editorFocus'
+        });
+
+        registry.registerKeybinding({
+            command: EditContributions.Commands.INCREASE_FONT_SIZE.id,
+            keybinding: 'CtrlCmd+='
+        });
+        registry.registerKeybinding({
+            command: EditContributions.Commands.DECREASE_FONT_SIZE.id,
+            keybinding: 'CtrlCmd+-'
+        });
+
+        registry.registerKeybinding({
+            command: EditContributions.Commands.FIND.id,
+            keybinding: 'CtrlCmd+F'
+        });
+        registry.registerKeybinding({
+            command: EditContributions.Commands.FIND_NEXT.id,
+            keybinding: 'CtrlCmd+G'
+        });
+        registry.registerKeybinding({
+            command: EditContributions.Commands.FIND_PREVIOUS.id,
+            keybinding: 'CtrlCmd+Shift+G'
+        });
+        registry.registerKeybinding({
+            command: EditContributions.Commands.USE_FOR_FIND.id,
+            keybinding: 'CtrlCmd+E'
+        });
+
+        // `Tools`
+        registry.registerKeybinding({
+            command: EditContributions.Commands.AUTO_FORMAT.id,
+            keybinding: 'CtrlCmd+T'
+        });
+    }
+
+    protected async current(): Promise<monaco.editor.ICodeEditor | undefined> {
+        return this.codeEditorService.getFocusedCodeEditor() || this.codeEditorService.getActiveCodeEditor();
+    }
+
+    protected async currentValue(): Promise<string | undefined> {
+        const currentEditor = await this.current();
+        if (currentEditor) {
+            const selection = currentEditor.getSelection();
+            if (!selection || selection.isEmpty()) {
+                return currentEditor.getValue();
+            }
+            return currentEditor.getModel()?.getValueInRange(selection);
+        }
+        return undefined;
+    }
+
+    protected async run(commandId: string): Promise<any> {
+        const editor = await this.current();
+        if (editor) {
+            const action = editor.getAction(commandId);
+            if (action) {
+                return action.run();
+            }
+        }
+    }
+
+}
+
+export namespace EditContributions {
+    export namespace Commands {
+        export const COPY_FOR_FORUM: Command = {
+            id: 'arduino-copy-for-forum'
+        };
+        export const COPY_FOR_GITHUB: Command = {
+            id: 'arduino-copy-for-github'
+        };
+        export const GO_TO_LINE: Command = {
+            id: 'arduino-go-to-line'
+        };
+        export const TOGGLE_COMMENT: Command = {
+            id: 'arduino-toggle-comment'
+        };
+        export const INDENT_LINES: Command = {
+            id: 'arduino-indent-lines'
+        };
+        export const OUTDENT_LINES: Command = {
+            id: 'arduino-outdent-lines'
+        };
+        export const FIND: Command = {
+            id: 'arduino-find'
+        };
+        export const FIND_NEXT: Command = {
+            id: 'arduino-find-next'
+        };
+        export const FIND_PREVIOUS: Command = {
+            id: 'arduino-find-previous'
+        };
+        export const USE_FOR_FIND: Command = {
+            id: 'arduino-for-find'
+        };
+        export const INCREASE_FONT_SIZE: Command = {
+            id: 'arduino-increase-font-size'
+        };
+        export const DECREASE_FONT_SIZE: Command = {
+            id: 'arduino-decrease-font-size'
+        };
+        export const AUTO_FORMAT: Command = {
+            id: 'arduino-auto-format' // `Auto Format` should belong to `Tool`.
+        };
+    }
+}

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

@@ -0,0 +1,184 @@
+import * as PQueue from 'p-queue';
+import { inject, injectable, postConstruct } from 'inversify';
+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, PlaceholderMenuNode } from '../menu/arduino-menus';
+import { MainMenuManager } from '../../common/main-menu-manager';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+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;
+
+    @inject(MenuModelRegistry)
+    protected readonly menuRegistry: MenuModelRegistry;
+
+    @inject(MainMenuManager)
+    protected readonly menuManager: MainMenuManager;
+
+    @inject(ExamplesService)
+    protected readonly examplesService: ExamplesService;
+
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClient: BoardsServiceProvider;
+
+    protected readonly toDispose = new DisposableCollection();
+
+    @postConstruct()
+    init(): void {
+        this.boardsServiceClient.onBoardsConfigChanged(({ selectedBoard }) => this.handleBoardChanged(selectedBoard));
+    }
+
+    protected handleBoardChanged(board: Board | undefined): void {
+        // NOOP
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        try {
+            // 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 examples = new CompositeMenuNode(menuId, '', { order: '4' });
+            parent.addNode(examples);
+        } catch (e) {
+            console.error(e);
+            console.warn('Could not patch menu ordering.');
+        }
+        // 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' });
+    }
+
+    registerRecursively(
+        sketchContainerOrPlaceholder: SketchContainer | (Sketch | SketchContainer)[] | string,
+        menuPath: MenuPath,
+        pushToDispose: DisposableCollection = new DisposableCollection(),
+        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;
+
+            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);
+                    }
+                }
+            }
+            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);
+                    }
+                };
+                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)));
+            }
+        }
+    }
+
+}
+
+@injectable()
+export class BuiltInExamples extends Examples {
+
+    onStart(): void {
+        this.register(); // no `await`
+    }
+
+    protected async register(): Promise<void> {
+        let sketchContainers: SketchContainer[] | undefined;
+        try {
+            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.');
+            return;
+        }
+        this.toDispose.dispose();
+        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;
+
+    protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
+
+    onStart(): void {
+        this.register(); // no `await`
+        this.notificationCenter.onLibraryInstalled(() => this.register());
+        this.notificationCenter.onLibraryUninstalled(() => this.register());
+    }
+
+    protected handleBoardChanged(board: Board | undefined): void {
+        this.register(board);
+    }
+
+    protected async register(board: Board | undefined = this.boardsServiceClient.boardsConfig.selectedBoard): Promise<void> {
+        return this.queue.add(async () => {
+            this.toDispose.dispose();
+            if (!board || !board.fqbn) {
+                return;
+            }
+            const { fqbn, name } = board;
+            const { user, current, any } = await this.examplesService.installed({ fqbn });
+            if (user.length) {
+                (user as any).unshift('Examples from Custom Libraries');
+            }
+            if (current.length) {
+                (current as any).unshift(`Examples for ${name}`);
+            }
+            if (any.length) {
+                (any as any).unshift('Examples for any board');
+            }
+            for (const container of user) {
+                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);
+            }
+            for (const container of any) {
+                this.registerRecursively(container, ArduinoMenus.EXAMPLES__ANY_BOARD_GROUP, this.toDispose);
+            }
+            this.menuManager.update();
+        });
+    }
+
+}

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

@@ -0,0 +1,137 @@
+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

@@ -0,0 +1,177 @@
+import * as PQueue from 'p-queue';
+import { inject, injectable } from 'inversify';
+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, 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';
+import { SketchContribution, Command, CommandRegistry } from './contribution';
+import { NotificationCenter } from '../notification-center';
+
+@injectable()
+export class IncludeLibrary extends SketchContribution {
+
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
+
+    @inject(MenuModelRegistry)
+    protected readonly menuRegistry: MenuModelRegistry;
+
+    @inject(MainMenuManager)
+    protected readonly mainMenuManager: MainMenuManager;
+
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
+
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
+
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClient: BoardsServiceProvider;
+
+    @inject(LibraryService)
+    protected readonly libraryService: LibraryService;
+
+    protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
+    protected readonly toDispose = new DisposableCollection();
+
+    onStart(): void {
+        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 => {
+                if (LibraryPackage.is(arg)) {
+                    this.includeLibrary(arg);
+                }
+            }
+        });
+    }
+
+    protected async updateMenuActions(): Promise<void> {
+        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 }));
+            }
+
+            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'];
+            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(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, 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)),
+        );
+    }
+
+    protected async includeLibrary(library: LibraryPackage): Promise<void> {
+        const sketch = await this.sketchServiceClient.currentSketch();
+        if (!sketch) {
+            return;
+        }
+        // If the current editor is one of the additional files from the sketch, we use that.
+        // Otherwise, we pick the editor of the main sketch file.
+        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())) {
+                codeEditor = editor.getControl();
+            }
+        }
+
+        if (!codeEditor) {
+            const widget = await this.editorManager.open(new URI(sketch.mainFileUri));
+            if (widget.editor instanceof MonacoEditor) {
+                codeEditor = widget.editor.getControl();
+            }
+        }
+
+        if (!codeEditor) {
+            return;
+        }
+
+        const textModel = codeEditor.getModel();
+        if (!textModel) {
+            return;
+        }
+        const cursorState = codeEditor.getSelections() || [];
+        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);
+        textModel.pushStackElement(); // Start a fresh operation.
+        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'
+        };
+    }
+}

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

@@ -0,0 +1,63 @@
+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';
+
+@injectable()
+export class NewSketch extends SketchContribution {
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(NewSketch.Commands.NEW_SKETCH, {
+            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)
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
+            commandId: NewSketch.Commands.NEW_SKETCH.id,
+            label: 'New',
+            order: '0'
+        });
+    }
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybinding({
+            command: NewSketch.Commands.NEW_SKETCH.id,
+            keybinding: 'CtrlCmd+N'
+        });
+    }
+
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+        registry.registerItem({
+            id: NewSketch.Commands.NEW_SKETCH__TOOLBAR.id,
+            command: NewSketch.Commands.NEW_SKETCH__TOOLBAR.id,
+            tooltip: 'New',
+            priority: 3
+        });
+    }
+
+    async newSketch(): Promise<void> {
+        try {
+            const sketch = await this.sketchService.createNewSketch();
+            this.workspaceService.open(new URI(sketch.uri));
+        } catch (e) {
+            await this.messageService.error(e.toString());
+        }
+    }
+
+}
+
+export namespace NewSketch {
+    export namespace Commands {
+        export const NEW_SKETCH: Command = {
+            id: 'arduino-new-sketch'
+        };
+        export const NEW_SKETCH__TOOLBAR: Command = {
+            id: 'arduino-new-sketch--toolbar'
+        };
+    }
+}

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

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

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

@@ -0,0 +1,52 @@
+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';
+
+@injectable()
+export class OpenSketchExternal extends SketchContribution {
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(OpenSketchExternal.Commands.OPEN_EXTERNAL, {
+            execute: () => this.openExternal()
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.SKETCH__UTILS_GROUP, {
+            commandId: OpenSketchExternal.Commands.OPEN_EXTERNAL.id,
+            label: 'Show Sketch Folder',
+            order: '0'
+        });
+    }
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybinding({
+            command: OpenSketchExternal.Commands.OPEN_EXTERNAL.id,
+            keybinding: 'CtrlCmd+Alt+K'
+        });
+    }
+
+    protected async openExternal(): Promise<void> {
+        const uri = await this.sketchServiceClient.currentSketchFile();
+        if (uri) {
+            const exists = this.fileService.exists(new URI(uri));
+            if (exists) {
+                const fsPath = await this.fileService.fsPath(new URI(uri));
+                if (fsPath) {
+                    remote.shell.showItemInFolder(fsPath);
+                }
+            }
+        }
+    }
+
+}
+
+export namespace OpenSketchExternal {
+    export namespace Commands {
+        export const OPEN_EXTERNAL: Command = {
+            id: 'arduino-open-sketch-external'
+        };
+    }
+}

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

@@ -0,0 +1,175 @@
+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 { ArduinoMenus } from '../menu/arduino-menus';
+import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
+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;
+
+    @inject(ContextMenuRenderer)
+    protected readonly contextMenuRenderer: ContextMenuRenderer;
+
+    @inject(BuiltInExamples)
+    protected readonly builtInExamples: BuiltInExamples;
+
+    @inject(ExamplesService)
+    protected readonly examplesService: ExamplesService;
+
+    @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()
+        });
+        registry.registerCommand(OpenSketch.Commands.OPEN_SKETCH__TOOLBAR, {
+            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
+            execute: async (_: Widget, target: EventTarget) => {
+                const container = await this.sketchService.getSketches({ exclude: ['**/hardware/**'] });
+                if (SketchContainer.isEmpty(container)) {
+                    this.openSketch();
+                } else {
+                    this.toDispose.dispose();
+                    if (!(target instanceof HTMLElement)) {
+                        return;
+                    }
+                    const { parentElement } = target;
+                    if (!parentElement) {
+                        return;
+                    }
+
+                    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();
+                        for (const container of containers) {
+                            this.builtInExamples.registerRecursively(container, ArduinoMenus.OPEN_SKETCH__CONTEXT__EXAMPLES_GROUP, this.toDispose);
+                        }
+                    } catch (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
+                        }
+                    }
+                    this.contextMenuRenderer.render(options);
+                }
+            }
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
+            commandId: OpenSketch.Commands.OPEN_SKETCH.id,
+            label: 'Open...',
+            order: '1'
+        });
+    }
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybinding({
+            command: OpenSketch.Commands.OPEN_SKETCH.id,
+            keybinding: 'CtrlCmd+O'
+        });
+    }
+
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+        registry.registerItem({
+            id: OpenSketch.Commands.OPEN_SKETCH__TOOLBAR.id,
+            command: OpenSketch.Commands.OPEN_SKETCH__TOOLBAR.id,
+            tooltip: 'Open',
+            priority: 4
+        });
+    }
+
+    async openSketch(toOpen: MaybePromise<Sketch | undefined> = this.selectSketch()): Promise<void> {
+        const sketch = await toOpen;
+        if (sketch) {
+            this.workspaceService.open(new URI(sketch.uri));
+        }
+    }
+
+    protected async selectSketch(): Promise<Sketch | undefined> {
+        const config = await this.configService.getConfiguration();
+        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', 'pde']
+                }
+            ]
+        });
+        if (!filePaths.length) {
+            return undefined;
+        }
+        if (filePaths.length > 1) {
+            this.logger.warn(`Multiple sketches were selected: ${filePaths}. Using the first one.`);
+        }
+        const sketchFilePath = filePaths[0];
+        const sketchFileUri = await this.fileSystemExt.getUri(sketchFilePath);
+        const sketch = await this.sketchService.getSketchFolder(sketchFileUri);
+        if (sketch) {
+            return sketch;
+        }
+        if (Sketch.isSketchFile(sketchFileUri)) {
+            const name = new URI(sketchFileUri).path.name;
+            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?`
+            });
+            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.`
+                    });
+                    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());
+            }
+        }
+    }
+
+}
+
+export namespace OpenSketch {
+    export namespace Commands {
+        export const OPEN_SKETCH: Command = {
+            id: 'arduino-open-sketch'
+        };
+        export const OPEN_SKETCH__TOOLBAR: Command = {
+            id: 'arduino-open-sketch--toolbar'
+        };
+    }
+}

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

@@ -0,0 +1,46 @@
+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 { 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()
+            });
+        }
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        // 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'
+            });
+        }
+    }
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        if (!isOSX) {
+            registry.registerKeybinding({
+                command: QuitApp.Commands.QUIT_APP.id,
+                keybinding: 'CtrlCmd+Q'
+            });
+        }
+    }
+
+}
+
+export namespace QuitApp {
+    export namespace Commands {
+        export const QUIT_APP: Command = {
+            id: 'arduino-quit-app'
+        };
+    }
+}

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

@@ -0,0 +1,96 @@
+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';
+
+@injectable()
+export class SaveAsSketch extends SketchContribution {
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(SaveAsSketch.Commands.SAVE_AS_SKETCH, {
+            execute: args => this.saveAs(args)
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
+            commandId: SaveAsSketch.Commands.SAVE_AS_SKETCH.id,
+            label: 'Save As...',
+            order: '7'
+        });
+    }
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybinding({
+            command: SaveAsSketch.Commands.SAVE_AS_SKETCH.id,
+            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> {
+        const sketch = await this.sketchServiceClient.currentSketch();
+        if (!sketch) {
+            return false;
+        }
+
+        const isTemp = await this.sketchService.isTemp(sketch);
+        if (!isTemp && !!execOnlyIfTemp) {
+            return false;
+        }
+
+        // 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 defaultUri = exists
+            ? 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 });
+        if (!filePath || canceled) {
+            return false;
+        }
+        const destinationUri = await this.fileSystemExt.getUri(filePath);
+        if (!destinationUri) {
+            return false;
+        }
+        const workspaceUri = await this.sketchService.copy(sketch, { destinationUri });
+        if (workspaceUri && openAfterMove) {
+            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 });
+        }
+        return !!workspaceUri;
+    }
+
+}
+
+export namespace SaveAsSketch {
+    export namespace Commands {
+        export const SAVE_AS_SKETCH: Command = {
+            id: 'arduino-save-as-sketch'
+        };
+    }
+    export interface Options {
+        readonly execOnlyIfTemp?: boolean;
+        readonly openAfterMove?: boolean;
+        /**
+         * Ignored if `openAfterMove` is `false`.
+         */
+        readonly wipeOriginal?: boolean;
+    }
+    export namespace Options {
+        export const DEFAULT: Options = {
+            execOnlyIfTemp: false,
+            openAfterMove: true,
+            wipeOriginal: false
+        };
+    }
+}

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

@@ -0,0 +1,59 @@
+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';
+
+@injectable()
+export class SaveSketch extends SketchContribution {
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(SaveSketch.Commands.SAVE_SKETCH, {
+            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)
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
+            commandId: SaveSketch.Commands.SAVE_SKETCH.id,
+            label: 'Save',
+            order: '6'
+        });
+    }
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybinding({
+            command: SaveSketch.Commands.SAVE_SKETCH.id,
+            keybinding: 'CtrlCmd+S'
+        });
+    }
+
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+        registry.registerItem({
+            id: SaveSketch.Commands.SAVE_SKETCH__TOOLBAR.id,
+            command: SaveSketch.Commands.SAVE_SKETCH__TOOLBAR.id,
+            tooltip: 'Save',
+            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'
+        };
+        export const SAVE_SKETCH__TOOLBAR: Command = {
+            id: 'arduino-save-sketch--toolbar'
+        };
+    }
+}

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

@@ -0,0 +1,60 @@
+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, {
+            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: Settings.Commands.OPEN.id,
+            label: 'Preferences...',
+            order: '0'
+        });
+    }
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybinding({
+            command: Settings.Commands.OPEN.id,
+            keybinding: 'CtrlCmd+,',
+        });
+    }
+
+}
+
+export namespace Settings {
+    export namespace Commands {
+        export const OPEN: Command = {
+            id: 'arduino-settings-open',
+            label: 'Open Preferences...',
+            category: 'Arduino'
+        }
+    }
+}

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

@@ -0,0 +1,129 @@
+import { inject, injectable } from 'inversify';
+import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribution';
+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';
+
+@injectable()
+export class SketchControl extends SketchContribution {
+
+    @inject(ApplicationShell)
+    protected readonly shell: ApplicationShell;
+
+    @inject(MenuModelRegistry)
+    protected readonly menuRegistry: MenuModelRegistry;
+
+    @inject(ContextMenuRenderer)
+    protected readonly contextMenuRenderer: ContextMenuRenderer;
+
+    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, rootFolderFileUris } = await this.sketchService.loadSketch(sketch.uri);
+                const uris = [mainFileUri, ...rootFolderFileUris];
+                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
+                    }
+                }
+                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__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'
+        });
+        registry.registerKeybinding({
+            command: CommonCommands.PREVIOUS_TAB.id,
+            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'
+        });
+    }
+
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+        registry.registerItem({
+            id: SketchControl.Commands.OPEN_SKETCH_CONTROL__TOOLBAR.id,
+            command: SketchControl.Commands.OPEN_SKETCH_CONTROL__TOOLBAR.id
+        });
+    }
+
+}
+
+export namespace SketchControl {
+    export namespace Commands {
+        export const OPEN_SKETCH_CONTROL__TOOLBAR: Command = {
+            id: 'arduino-open-sketch-control--toolbar',
+            iconClass: 'fa fa-caret-down'
+        };
+    }
+}

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

@@ -0,0 +1,46 @@
+import { inject, injectable } from 'inversify';
+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';
+
+@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);
+    }
+
+}

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

@@ -0,0 +1,189 @@
+import { inject, injectable } from 'inversify';
+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';
+
+@injectable()
+export class UploadSketch extends SketchContribution {
+
+    @inject(CoreService)
+    protected readonly coreService: CoreService;
+
+    @inject(MonitorConnection)
+    protected readonly monitorConnection: MonitorConnection;
+
+    @inject(BoardsDataStore)
+    protected readonly boardsDataStore: BoardsDataStore;
+
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClientImpl: BoardsServiceProvider;
+
+    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(),
+            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',
+            isEnabled: () => !this.uploadInProgress,
+            isToggled: () => this.uploadInProgress,
+            execute: () => registry.executeCommand(UploadSketch.Commands.UPLOAD_SKETCH.id)
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
+            commandId: UploadSketch.Commands.UPLOAD_SKETCH.id,
+            label: 'Upload',
+            order: '1'
+        });
+        registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
+            commandId: UploadSketch.Commands.UPLOAD_SKETCH_USING_PROGRAMMER.id,
+            label: 'Upload Using Programmer',
+            order: '2'
+        });
+    }
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybinding({
+            command: UploadSketch.Commands.UPLOAD_SKETCH.id,
+            keybinding: 'CtrlCmd+U'
+        });
+        registry.registerKeybinding({
+            command: UploadSketch.Commands.UPLOAD_SKETCH_USING_PROGRAMMER.id,
+            keybinding: 'CtrlCmd+Shift+U'
+        });
+    }
+
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+        registry.registerItem({
+            id: UploadSketch.Commands.UPLOAD_SKETCH_TOOLBAR.id,
+            command: UploadSketch.Commands.UPLOAD_SKETCH_TOOLBAR.id,
+            tooltip: 'Upload',
+            priority: 1,
+            onDidChange: this.onDidChange
+        });
+    }
+
+    async uploadSketch(usingProgrammer: boolean = 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;
+        const monitorConfig = this.monitorConnection.monitorConfig;
+        if (monitorConfig) {
+            await this.monitorConnection.disconnect();
+            if (this.monitorConnection.autoConnect) {
+                shouldAutoConnect = true;
+            }
+            this.monitorConnection.autoConnect = false;
+        }
+        try {
+            const { boardsConfig } = this.boardsServiceClientImpl;
+            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 = sketch.uri;
+            const optimizeForDebug = this.editorMode.compileForDebug;
+            const { selectedPort } = boardsConfig;
+            const port = selectedPort?.address;
+
+            if (usingProgrammer) {
+                const programmer = selectedProgrammer;
+                options = {
+                    sketchUri,
+                    fqbn,
+                    optimizeForDebug,
+                    programmer,
+                    port,
+                    verbose,
+                    verify,
+                    sourceOverride
+                };
+            } else {
+                options = {
+                    sketchUri,
+                    fqbn,
+                    optimizeForDebug,
+                    port,
+                    verbose,
+                    verify,
+                    sourceOverride
+                };
+            }
+            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 });
+        } 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);
+                    if (shouldAutoConnect) {
+                        // Enabling auto-connect will trigger a connect.
+                        this.monitorConnection.autoConnect = true;
+                    } else {
+                        await this.monitorConnection.connect(monitorConfig);
+                    }
+                } catch (waitError) {
+                    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'
+        };
+        export const UPLOAD_SKETCH_USING_PROGRAMMER: Command = {
+            id: 'arduino-upload-sketch-using-programmer'
+        };
+        export const UPLOAD_SKETCH_TOOLBAR: Command = {
+            id: 'arduino-upload-sketch--toolbar'
+        };
+    }
+}

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

@@ -0,0 +1,135 @@
+import { inject, injectable } from 'inversify';
+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';
+
+@injectable()
+export class VerifySketch extends SketchContribution {
+
+    @inject(CoreService)
+    protected readonly coreService: CoreService;
+
+    @inject(BoardsDataStore)
+    protected readonly boardsDataStore: BoardsDataStore;
+
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClientImpl: BoardsServiceProvider;
+
+    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(),
+            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',
+            isEnabled: () => !this.verifyInProgress,
+            isToggled: () => this.verifyInProgress,
+            execute: () => registry.executeCommand(VerifySketch.Commands.VERIFY_SKETCH.id)
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
+            commandId: VerifySketch.Commands.VERIFY_SKETCH.id,
+            label: 'Verify/Compile',
+            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'
+        });
+        registry.registerKeybinding({
+            command: VerifySketch.Commands.EXPORT_BINARIES.id,
+            keybinding: 'CtrlCmd+Alt+S'
+        });
+    }
+
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+        registry.registerItem({
+            id: VerifySketch.Commands.VERIFY_SKETCH_TOOLBAR.id,
+            command: VerifySketch.Commands.VERIFY_SKETCH_TOOLBAR.id,
+            tooltip: 'Verify',
+            priority: 0,
+            onDidChange: this.onDidChange
+        });
+    }
+
+    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, 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: sketch.uri,
+                fqbn,
+                optimizeForDebug: this.editorMode.compileForDebug,
+                verbose,
+                exportBinaries,
+                sourceOverride,
+                compilerWarnings
+            });
+            this.messageService.info('Done compiling.', { timeout: 1000 });
+        } 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'
+        };
+        export const EXPORT_BINARIES: Command = {
+            id: 'arduino-export-binaries'
+        };
+        export const VERIFY_SKETCH_TOOLBAR: Command = {
+            id: 'arduino-verify-sketch--toolbar'
+        };
+    }
+}

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

@@ -1,25 +0,0 @@
-import { injectable, inject, postConstruct } from 'inversify';
-import { AboutDialog, ABOUT_CONTENT_CLASS } from '@theia/core/lib/browser/about-dialog';
-import { ConfigService } from '../../common/protocol/config-service';
-
-@injectable()
-export class ArduinoAboutDialog extends AboutDialog {
-
-    @inject(ConfigService)
-    protected readonly configService: ConfigService;
-
-    @postConstruct()
-    protected async init(): Promise<void> {
-        const [, version] = await Promise.all([super.init(), this.configService.getVersion()]);
-        if (version) {
-            const { firstChild } = this.contentNode;
-            if (firstChild instanceof HTMLElement && firstChild.classList.contains(ABOUT_CONTENT_CLASS)) {
-                const cliVersion = document.createElement('div');
-                cliVersion.textContent = version;
-                firstChild.appendChild(cliVersion);
-                // TODO: anchor to the commit in the `arduino-cli` repository.
-            }
-        }
-    }
-
-}

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

@@ -1,46 +0,0 @@
-import { ApplicationShell, Widget, Saveable, FocusTracker, Message } from '@theia/core/lib/browser';
-import { EditorWidget } from '@theia/editor/lib/browser';
-import { injectable, inject } from 'inversify';
-import { EditorMode } from '../editor-mode';
-
-@injectable()
-export class ArduinoApplicationShell extends ApplicationShell {
-
-    @inject(EditorMode)
-    protected readonly editorMode: EditorMode;
-
-    protected refreshBottomPanelToggleButton() {
-        if (this.editorMode.proMode) {
-            super.refreshBottomPanelToggleButton();
-        }
-    }
-
-    protected async track(widget: Widget): Promise<void> {
-        if (this.editorMode.proMode) {
-            super.track(widget);
-        } else {
-            const tracker = (this as any).tracker as FocusTracker<Widget>;
-            tracker.add(widget);
-            this.disableClose(Saveable.apply(widget));
-            if (ApplicationShell.TrackableWidgetProvider.is(widget)) {
-                for (const toTrack of await widget.getTrackableWidgets()) {
-                    tracker.add(toTrack);
-                    this.disableClose(Saveable.apply(toTrack));
-                }
-                if (widget.onDidChangeTrackableWidgets) {
-                    widget.onDidChangeTrackableWidgets(widgets => widgets.forEach(w => this.track(w)));
-                }
-            }
-        }
-    }
-
-    private disableClose(widget: Widget | undefined): void {
-        if (widget instanceof EditorWidget) {
-            const onCloseRequest = (_: Message) => {
-                // NOOP
-            };
-            (widget as any).onCloseRequest = onCloseRequest.bind(widget);
-        }
-    }
-
-}

arduino-ide-extension/src/browser/customization/arduino-frontend-application.ts

@@ -1,42 +0,0 @@
-import { injectable, inject } from 'inversify';
-import { FileSystem } from '@theia/filesystem/lib/common/filesystem';
-import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
-import { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
-import { EditorMode } from '../editor-mode';
-import { ArduinoFrontendContribution } from '../arduino-frontend-contribution';
-
-@injectable()
-export class ArduinoFrontendApplication extends FrontendApplication {
-
-    @inject(FileSystem)
-    protected readonly fileSystem: FileSystem;
-
-    @inject(WorkspaceService)
-    protected readonly workspaceService: WorkspaceService;
-
-    @inject(ArduinoFrontendContribution)
-    protected readonly frontendContribution: ArduinoFrontendContribution;
-
-    @inject(EditorMode)
-    protected readonly editorMode: EditorMode;
-
-    protected async initializeLayout(): Promise<void> {
-        return super.initializeLayout().then(() => {
-            // If not in PRO mode, we open the sketch file with all the related files.
-            // Otherwise, we reuse the workbench's restore functionality and we do not open anything at all.
-            // TODO: check `otherwise`. Also, what if we check for opened editors, instead of blindly opening them?
-            if (!this.editorMode.proMode) {
-                this.workspaceService.roots.then(roots => {
-                    for (const root of roots) {
-                        this.fileSystem.exists(root.uri).then(exists => {
-                            if (exists) {
-                                this.frontendContribution.openSketchFiles(root.uri);
-                            }
-                        });
-                    }
-                });
-            }
-        });
-    }
-
-}

arduino-ide-extension/src/browser/customization/arduino-monaco-status-bar-contribution.ts

@@ -1,11 +0,0 @@
-import { MonacoStatusBarContribution } from '@theia/monaco/lib/browser/monaco-status-bar-contribution';
-
-export class ArduinoMonacoStatusBarContribution extends MonacoStatusBarContribution {
-
-    protected setConfigTabSizeWidget() {
-    }
-
-    protected setLineEndingWidget() {
-    }
-
-}

arduino-ide-extension/src/browser/customization/arduino-navigator-contribution.ts

@@ -1,18 +0,0 @@
-import { injectable, inject } from 'inversify';
-import { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
-import { FileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution';
-import { EditorMode } from '../editor-mode';
-
-@injectable()
-export class ArduinoNavigatorContribution extends FileNavigatorContribution {
-
-    @inject(EditorMode)
-    protected readonly editorMode: EditorMode;
-
-    async initializeLayout(app: FrontendApplication): Promise<void> {
-        if (this.editorMode.proMode) {
-            return super.initializeLayout(app);
-        }
-    }
-
-}

arduino-ide-extension/src/browser/customization/arduino-outline-contribution.ts

@@ -1,19 +0,0 @@
-import { injectable, inject } from 'inversify';
-import { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
-import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution';
-import { EditorMode } from '../editor-mode';
-
-@injectable()
-export class ArduinoOutlineViewContribution extends OutlineViewContribution {
-
-    @inject(EditorMode)
-    protected readonly editorMode: EditorMode;
-
-    async initializeLayout(app: FrontendApplication): Promise<void> {
-        if (this.editorMode.proMode) {
-            return super.initializeLayout(app);
-        }
-    }
-
-}
-

arduino-ide-extension/src/browser/customization/arduino-output-tool-contribution.ts

@@ -1,18 +0,0 @@
-import { inject, injectable } from 'inversify';
-import { TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import { OutputToolbarContribution } from '@theia/output/lib/browser/output-toolbar-contribution';
-import { EditorMode } from '../editor-mode';
-
-@injectable()
-export class ArduinoOutputToolContribution extends OutputToolbarContribution {
-
-    @inject(EditorMode)
-    protected readonly editorMode: EditorMode;
-
-    async registerToolbarItems(toolbarRegistry: TabBarToolbarRegistry): Promise<void> {
-        if (this.editorMode.proMode) {
-            super.registerToolbarItems(toolbarRegistry);
-        }
-    }
-
-}

arduino-ide-extension/src/browser/customization/arduino-problem-contribution.ts

@@ -1,25 +0,0 @@
-import { inject, injectable } from 'inversify';
-import { ProblemStat } from '@theia/markers/lib/browser/problem/problem-manager';
-import { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
-import { ProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution';
-import { EditorMode } from '../editor-mode';
-
-@injectable()
-export class ArduinoProblemContribution extends ProblemContribution {
-
-    @inject(EditorMode)
-    protected readonly editorMode: EditorMode;
-
-    async initializeLayout(app: FrontendApplication): Promise<void> {
-        if (this.editorMode.proMode) {
-            return super.initializeLayout(app);
-        }
-    }
-
-    protected setStatusBarElement(problemStat: ProblemStat): void {
-        if (this.editorMode.proMode) {
-            super.setStatusBarElement(problemStat);
-        }
-    }
-
-}

arduino-ide-extension/src/browser/customization/arduino-scm-contribution.ts

@@ -1,24 +0,0 @@
-import { inject, injectable } from 'inversify';
-import { ScmContribution } from '@theia/scm/lib/browser/scm-contribution';
-import { StatusBarEntry } from '@theia/core/lib/browser/status-bar/status-bar';
-import { EditorMode } from '../editor-mode';
-
-@injectable()
-export class ArduinoScmContribution extends ScmContribution {
-
-    @inject(EditorMode)
-    protected readonly editorMode: EditorMode;
-
-    async initializeLayout(): Promise<void> {
-        if (this.editorMode.proMode) {
-            return super.initializeLayout();
-        }
-    }
-
-    protected setStatusBarEntry(id: string, entry: StatusBarEntry): void {
-        if (this.editorMode.proMode) {
-            super.setStatusBarEntry(id, entry);
-        }
-    }
-
-}

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

@@ -1,18 +0,0 @@
-import { inject, injectable } from 'inversify';
-import { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
-import { SearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution';
-import { EditorMode } from '../editor-mode';
-
-@injectable()
-export class ArduinoSearchInWorkspaceContribution extends SearchInWorkspaceFrontendContribution {
-
-    @inject(EditorMode)
-    protected readonly editorMode: EditorMode;
-
-    async initializeLayout(app: FrontendApplication): Promise<void> {
-        if (this.editorMode.proMode) {
-            return super.initializeLayout(app);
-        }
-    }
-
-}

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

@@ -1,91 +1,117 @@
 {
-	"tokenColors": [
-		{
-			"settings": {
-				"foreground": "#434f54"
-			}
-		},
-		{
-			"name": "Comments",
-			"scope": "comment",
-			"settings": {
-				"foreground": "#95a5a6cc"
-			}
-		},
-		{
-			"name": "Keywords Attributes",
-			"scope": [
-				"storage",
-				"support",
-				"string.quoted.single.c"
-			],
-			"settings": {
-				"foreground": "#00979D"
-			}
-		},
-		{
-			"name": "literal",
-			"scope": [
-				"meta.function.c",
-				"entity.name.function",
-				"meta.function-call.c"
-			],
-			"settings": {
-				"foreground": "#D35400"
-			}
-		},
-		{
-			"name": "punctuation",
-			"scope": [
-				"punctuation.section",
-				"meta.function-call.c",
-				"meta.block.c",
-				"meta.function.c",
-				"entity.name.function.preprocessor.c",
-				"meta.preprocessor.macro.c"
-			],
-			"settings": {
-				"foreground": "#434f54"
-			}
-		},
-		{
-			"name": "strings",
-			"scope": [
-				"string.quoted.double"
-			],
-			"settings": {
-				"foreground": "#005C5F"
-			}
-		},
-		{
-			"name": "meta keywords",
-			"scope": [
-				"keyword.control",
-				"meta.preprocessor.c"
-			],
-			"settings": {
-				"foreground": "#728E00"
-			}
-		},
-		{
-			"name": "numeric preprocessor",
-			"scope": [
-				"meta.preprocessor.macro.c",
-				"constant.numeric.preprocessor.c",
-				"meta.preprocessor.c"
-			],
-			"settings": {
-				"foreground": "#434f54"
-			}
-		}
-	],
-	"colors": {
-		"editor.background": "#FFFFFF",
-		"editorCursor.foreground": "#434f54",
-		"editor.foreground": "#434f54",
-		"editorWhitespace.foreground": "#BFBFBF",
-		"editor.lineHighlightBackground": "#434f5410",
-		"editor.selectionBackground": "#ffcb00"
-	},
-	"name": "Arduino"
-}
+  "tokenColors": [
+    {
+      "settings": {
+        "foreground": "#434f54"
+      }
+    },
+    {
+      "name": "Comments",
+      "scope": "comment",
+      "settings": {
+        "foreground": "#95a5a6cc"
+      }
+    },
+    {
+      "name": "Keywords Attributes",
+      "scope": [
+        "storage",
+        "support",
+        "string.quoted.single.c"
+      ],
+      "settings": {
+        "foreground": "#00979D"
+      }
+    },
+    {
+      "name": "literal",
+      "scope": [
+        "meta.function.c",
+        "entity.name.function",
+        "meta.function-call.c"
+      ],
+      "settings": {
+        "foreground": "#D35400"
+      }
+    },
+    {
+      "name": "punctuation",
+      "scope": [
+        "punctuation.section",
+        "meta.function-call.c",
+        "meta.block.c",
+        "meta.function.c",
+        "entity.name.function.preprocessor.c",
+        "meta.preprocessor.macro.c"
+      ],
+      "settings": {
+        "foreground": "#434f54"
+      }
+    },
+    {
+      "name": "strings",
+      "scope": [
+        "string.quoted.double"
+      ],
+      "settings": {
+        "foreground": "#005C5F"
+      }
+    },
+    {
+      "name": "meta keywords",
+      "scope": [
+        "keyword.control",
+        "meta.preprocessor.c"
+      ],
+      "settings": {
+        "foreground": "#728E00"
+      }
+    },
+    {
+      "name": "numeric preprocessor",
+      "scope": [
+        "meta.preprocessor.macro.c",
+        "constant.numeric.preprocessor.c",
+        "meta.preprocessor.c"
+      ],
+      "settings": {
+        "foreground": "#434f54"
+      }
+    }
+  ],
+  "colors": {
+    "list.highlightForeground": "#005c5f",
+    "list.activeSelectionBackground": "#005c5f",
+    "editor.background": "#ffffff",
+    "editorCursor.foreground": "#434f54",
+    "editor.foreground": "#434f54",
+    "editorWhitespace.foreground": "#bfbfbf",
+    "editor.lineHighlightBackground": "#434f5410",
+    "editor.selectionBackground": "#ffcb00",
+    "focusBorder": "#7fcbcd99",
+    "menubar.selectionBackground": "#ffffff",
+    "menubar.selectionForeground": "#212121",
+    "menu.selectionBackground": "#dae3e3",
+    "menu.selectionForeground": "#212121",
+    "editorGroupHeader.tabsBackground": "#f7f9f9",
+    "button.background": "#7fcbcd",
+    "titleBar.activeBackground": "#005c5f",
+    "titleBar.activeForeground": "#ffffff",
+    "terminal.background": "#000000",
+    "terminal.foreground": "#e0e0e0",
+    "dropdown.border": "#ececec",
+    "dropdown.background": "#ececec",
+    "activityBar.background": "#ececec",
+    "activityBar.foreground": "#616161",
+    "statusBar.background": "#005c5f",
+    "secondaryButton.background": "#b5c8c9",
+    "secondaryButton.hoverBackground": "#dae3e3",
+    "arduino.branding.primary": "#00979d",
+    "arduino.branding.secondary": "#b5c8c9",
+    "arduino.foreground": "#edf1f1",
+    "arduino.output.foreground": "#FFFFFF",
+    "arduino.output.background": "#000000"
+  },
+  "type": "light",
+  "name": "Arduino"
+}

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

@@ -1,48 +1,33 @@
-import { injectable } from 'inversify';
-import { ApplicationShell, FrontendApplicationContribution, FrontendApplication } from '@theia/core/lib/browser';
-import { ArduinoShellLayoutRestorer } from './shell/arduino-shell-layout-restorer';
-import { OutputWidget } from '@theia/output/lib/browser/output-widget';
-import { EditorWidget } from '@theia/editor/lib/browser';
+import { injectable, inject } from 'inversify';
+import { FrontendApplicationContribution, FrontendApplication } from '@theia/core/lib/browser';
+import { MainMenuManager } from '../common/main-menu-manager';
 
 @injectable()
 export class EditorMode implements FrontendApplicationContribution {
 
+    @inject(MainMenuManager)
+    protected readonly mainMenuManager: MainMenuManager;
+
     protected app: FrontendApplication;
 
     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);
+    get compileForDebug(): boolean {
+        const value = window.localStorage.getItem(EditorMode.COMPILE_FOR_DEBUG_KEY);
         return value === 'true';
     }
 
-    async toggle(): 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 widget that is neither editor nor `Output`.
-            for (const area of ['left', 'right', 'bottom', 'main'] as Array<ApplicationShell.Area>) {
-                shell.closeTabs(area, ({ owner }) => !(owner instanceof EditorWidget || owner instanceof OutputWidget));
-            }
-        }
-        // `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 ArduinoShellLayoutRestorer
-        await layoutRestorer.storeLayoutAsync(this.app);
-        window.location.reload(true);
+    async toggleCompileForDebug(): Promise<void> {
+        const oldState = this.compileForDebug;
+        const newState = !oldState;
+        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/editor/arduino-monaco-editor-provider.ts

@@ -1,34 +0,0 @@
-import { inject, injectable } from 'inversify';
-import URI from '@theia/core/lib/common/uri';
-import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
-import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
-import { MonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
-import { ConfigService } from '../../common/protocol/config-service';
-
-@injectable()
-export class ArduinoMonacoEditorProvider extends MonacoEditorProvider {
-
-    @inject(ConfigService)
-    protected readonly configService: ConfigService;
-    protected dataDirUri: string | undefined;
-
-    protected async getModel(uri: URI, toDispose: DisposableCollection): Promise<MonacoEditorModel> {
-        // `createMonacoEditorOptions` is not `async` so we ask the `dataDirUri` here.
-        // https://github.com/eclipse-theia/theia/issues/6234
-        const { dataDirUri } = await this.configService.getConfiguration()
-        this.dataDirUri = dataDirUri;
-        return super.getModel(uri, toDispose);
-    }
-
-    protected createMonacoEditorOptions(model: MonacoEditorModel): MonacoEditor.IOptions {
-        const options = this.createOptions(this.preferencePrefixes, model.uri, model.languageId);
-        options.model = model.textEditorModel;
-        options.readOnly = model.readOnly;
-        if (this.dataDirUri) {
-            options.readOnly = new URI(this.dataDirUri).isEqualOrParent(new URI(model.uri));
-        }
-        return options;
-    }
-
-}

arduino-ide-extension/src/browser/icons/debug-dark.svg

@@ -0,0 +1,4 @@
+<!--Copyright (c) Microsoft Corporation. All rights reserved.-->
+<!--Copyright (C) 2019 TypeFox and others.-->
+<!--Licensed under the MIT License. See License.txt in the project root for license information.-->
+<svg width="28" height="28" viewBox="0 0 28 28" fill="#F6F6F6" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0)"><path d="M15.1673 18.0687V23.0247C15.1673 23.5637 15.2723 24.5 14.7315 24.5H12.8328V23.3327H14V19.6122L13.7988 19.4022C13.0604 20.0803 12.1008 20.4669 11.0986 20.49C10.0964 20.5132 9.11994 20.1714 8.351 19.5282C7 18.1737 7.13826 16.3327 8.60475 14H4.66726V15.1672H3.50001V13.2685C3.50001 12.7277 4.43626 12.8327 4.97526 12.8327H9.76326L15.1673 18.0687ZM11.6673 5.83275H10.5V4.66725H12.775C13.3123 4.66725 14 4.9245 14 5.4635V9.366L14.8593 10.3862C14.927 9.83979 15.1906 9.33644 15.6013 8.96958C16.0119 8.60271 16.5416 8.39723 17.0923 8.39125C17.2298 8.37945 17.3684 8.39492 17.5 8.43675V5.83275H18.6673V8.88825C18.703 8.99154 18.7618 9.08536 18.8391 9.16265C18.9164 9.23995 19.0102 9.29871 19.1135 9.3345H22.1673V10.5H19.5615C19.593 10.5 19.6105 10.675 19.6105 10.85C19.6058 11.4034 19.4011 11.9365 19.0341 12.3508C18.6671 12.7651 18.1626 13.0326 17.6138 13.104L18.634 14H22.5383C23.0773 14 23.3345 14.6807 23.3345 15.225V17.5H22.1673V16.3327H19.2273L11.6673 8.98275V5.83275ZM14 0C11.2311 0 8.52431 0.821086 6.22202 2.35943C3.91973 3.89776 2.12532 6.08426 1.06569 8.64243C0.00606593 11.2006 -0.271181 14.0155 0.269012 16.7313C0.809205 19.447 2.14258 21.9416 4.10051 23.8995C6.05845 25.8574 8.55301 27.1908 11.2687 27.731C13.9845 28.2712 16.7994 27.9939 19.3576 26.9343C21.9157 25.8747 24.1022 24.0803 25.6406 21.778C27.1789 19.4757 28 16.7689 28 14C28 10.287 26.525 6.72601 23.8995 4.1005C21.274 1.475 17.713 0 14 0V0ZM25.6673 14C25.6692 16.6908 24.7364 19.2988 23.0283 21.378L6.622 4.97175C8.33036 3.57269 10.4009 2.68755 12.5927 2.41935C14.7845 2.15115 17.0074 2.51091 19.0027 3.45676C20.998 4.40262 22.6836 5.89567 23.8635 7.76217C25.0433 9.62867 25.6689 11.7919 25.6673 14ZM2.33276 14C2.33066 11.3091 3.26351 8.70111 4.97176 6.622L21.378 23.03C19.6693 24.4284 17.5987 25.313 15.407 25.5807C13.2153 25.8485 10.9926 25.4884 8.99754 24.5425C7.00244 23.5965 5.31693 22.1036 4.13708 20.2373C2.95722 18.3709 2.33152 16.208 2.33276 14Z" fill="white"/></g><defs><clipPath id="clip0"><rect width="28" height="28" fill="#F6F6F6"/></clipPath></defs></svg>

arduino-ide-extension/src/browser/icons/monitor-tab-icon.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" width="24" height="24" viewBox="0, 0, 24, 24">
+    <g>
+      <path d="M16.2 8.1c0-4.5-3.6-8.1-8.1-8.1S0 3.6 0 8.1s3.6 8.1 8.1 8.1c1.9 0 3.7-.7 5.1-1.8l5.6 5.6 1.4-1.4-5.7-5.6c1.1-1.4 1.7-3.1 1.7-4.9zm-14.4 0c0-3.5 2.8-6.3 6.3-6.3s6.3 2.8 6.3 6.3-2.8 6.3-6.3 6.3c-3.5.1-6.3-2.8-6.3-6.3z" />
+      <rect x="7.1" y="7.1" width="2" height="2" />
+      <rect x="17.2" y="7.1" width="2" height="2" />
+      <rect x="20.3" y="7.1" width="2" height="2" />
+    </g>
+</svg>

arduino-ide-extension/src/browser/language/arduino-language-client-contribution.ts

@@ -1,53 +0,0 @@
-import { injectable, inject, postConstruct } from 'inversify';
-import { BaseLanguageClientContribution } from '@theia/languages/lib/browser';
-import { BoardsServiceClientImpl } from '../boards/boards-service-client-impl';
-import { BoardsConfig } from '../boards/boards-config';
-import { Board, BoardPackage } from '../../common/protocol/boards-service';
-
-@injectable()
-export class ArduinoLanguageClientContribution extends BaseLanguageClientContribution {
-
-    readonly id = 'ino';
-    readonly name = 'Arduino';
-
-    protected get documentSelector(): string[] {
-        return ['ino'];
-    }
-
-    protected get globPatterns() {
-        return ['**/*.ino'];
-    }
-
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
-
-    protected boardConfig?: BoardsConfig.Config;
-
-    @postConstruct()
-    protected init() {
-        this.boardsServiceClient.onBoardsConfigChanged(this.selectBoard.bind(this));
-        const restartIfAffected = (pkg: BoardPackage) => {
-            if (!this.boardConfig) {
-                this.restart();
-                return;
-            }
-            const { selectedBoard } = this.boardConfig;
-            if (selectedBoard && pkg.boards.some(board => Board.sameAs(board, selectedBoard))) {
-                this.restart();
-            }
-        }
-        this.boardsServiceClient.onBoardInstalled(({ pkg }) => restartIfAffected(pkg));
-        this.boardsServiceClient.onBoardUninstalled(({ pkg }) => restartIfAffected(pkg));
-    }
-
-    selectBoard(config: BoardsConfig.Config): void {
-        this.boardConfig = config;
-        // Force a restart to send the new board config to the language server
-        this.restart();
-    }
-
-    protected getStartParameters(): BoardsConfig.Config | undefined {
-        return this.boardConfig;
-    }
-
-}

arduino-ide-extension/src/browser/language/arduino-language-grammar-contribution.ts

@@ -1,63 +0,0 @@
-import { injectable } from 'inversify';
-import { LanguageGrammarDefinitionContribution, TextmateRegistry } from '@theia/monaco/lib/browser/textmate';
-
-@injectable()
-export class ArduinoLanguageGrammarContribution implements LanguageGrammarDefinitionContribution {
-
-    static INO_LANGUAGE_ID = 'ino';
-
-    registerTextmateLanguage(registry: TextmateRegistry) {
-        monaco.languages.register({
-            id: ArduinoLanguageGrammarContribution.INO_LANGUAGE_ID,
-            extensions: ['.ino'],
-            aliases: ['INO', 'Ino', 'ino'],
-        });
-
-        monaco.languages.setLanguageConfiguration(ArduinoLanguageGrammarContribution.INO_LANGUAGE_ID, this.configuration);
-
-        const inoGrammar = require('../../../data/ino.tmLanguage.json');
-        registry.registerTextmateGrammarScope('source.ino', {
-            async getGrammarDefinition() {
-                return {
-                    format: 'json',
-                    content: inoGrammar
-                };
-            }
-        });
-        registry.mapLanguageIdToTextmateGrammar(ArduinoLanguageGrammarContribution.INO_LANGUAGE_ID, 'source.ino');
-    }
-
-    private readonly configuration: monaco.languages.LanguageConfiguration = {
-        comments: {
-            lineComment: '//',
-            blockComment: ['/*', '*/'],
-        },
-        brackets: [
-            ['{', '}'],
-            ['[', ']'],
-            ['(', ')']
-        ],
-        autoClosingPairs: [
-            { open: '[', close: ']' },
-            { open: '{', close: '}' },
-            { open: '(', close: ')' },
-            { open: '\'', close: '\'', notIn: ['string', 'comment'] },
-            { open: '"', close: '"', notIn: ['string'] },
-            { open: '/*', close: ' */', notIn: ['string'] }
-        ],
-        surroundingPairs: [
-            { open: '{', close: '}' },
-            { open: '[', close: ']' },
-            { open: '(', close: ')' },
-            { open: '"', close: '"' },
-            { open: '\'', close: '\'' },
-        ],
-        folding: {
-            markers: {
-                start: new RegExp('^\\s*#pragma\\s+region\\b'),
-                end: new RegExp('^\\s*#pragma\\s+endregion\\b')
-            }
-        }
-    };
-
-}

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

@@ -1,17 +1,21 @@
-import { inject, injectable } from 'inversify';
-import { Library, LibraryService } from '../../common/protocol/library-service';
-import { ListWidget } from '../components/component-list/list-widget';
-import { ListItemRenderer } from '../components/component-list/list-item-renderer';
+import { injectable, postConstruct, inject } from 'inversify';
+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<Library> {
+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<Library>) {
+        @inject(ListItemRenderer) protected itemRenderer: ListItemRenderer<LibraryPackage>) {
 
         super({
             id: LibraryListWidget.WIDGET_ID,
@@ -19,9 +23,127 @@ export class LibraryListWidget extends ListWidget<Library> {
             iconClass: 'library-tab-icon',
             searchable: service,
             installable: service,
-            itemLabel: (item: Library) => item.name,
+            itemLabel: (item: LibraryPackage) => item.name,
             itemRenderer
         });
     }
 
+    @postConstruct()
+    protected init(): void {
+        super.init();
+        this.toDispose.pushAll([
+            this.notificationCenter.onLibraryInstalled(() => this.refresh(undefined)),
+            this.notificationCenter.onLibraryUninstalled(() => this.refresh(undefined)),
+        ]);
+    }
+
+    protected async install({ item, version }: { item: LibraryPackage, 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') {
+            return this.service.install({ item, version, installDependencies });
+        }
+    }
+
+}
+
+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

@@ -3,7 +3,7 @@ import { FrontendApplicationContribution } from '@theia/core/lib/browser/fronten
 import { AbstractViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
 import { MenuModelRegistry } from '@theia/core';
 import { LibraryListWidget } from './library-list-widget';
-import { ArduinoMenus } from '../arduino-frontend-contribution';
+import { ArduinoMenus } from '../menu/arduino-menus';
 
 @injectable()
 export class LibraryListWidgetFrontendContribution extends AbstractViewContribution<LibraryListWidget> implements FrontendApplicationContribution {
@@ -14,22 +14,23 @@ export class LibraryListWidgetFrontendContribution extends AbstractViewContribut
             widgetName: LibraryListWidget.WIDGET_LABEL,
             defaultWidgetOptions: {
                 area: 'left',
-                rank: 600
+                rank: 3
             },
             toggleCommandId: `${LibraryListWidget.WIDGET_ID}:toggle`,
-            toggleKeybinding: 'ctrlcmd+shift+l'
+            toggleKeybinding: 'CtrlCmd+Shift+I'
         });
     }
 
-    initializeLayout(): void {
-        // NOOP
+    async initializeLayout(): Promise<void> {
+        this.openView();
     }
 
     registerMenus(menus: MenuModelRegistry): void {
         if (this.toggleCommand) {
-            menus.registerMenuAction(ArduinoMenus.SKETCH, {
+            menus.registerMenuAction(ArduinoMenus.TOOLS__MAIN_GROUP, {
                 commandId: this.toggleCommand.id,
-                label: 'Manage Libraries...'
+                label: 'Manage Libraries...',
+                order: '3'
             });
         }
     }

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

@@ -0,0 +1,122 @@
+import { isOSX } from '@theia/core/lib/common/os';
+import { CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';
+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'];
+    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, '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'];
+    // `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__FIND_GROUP = [...CommonMenus.EDIT, '5_find'];
+
+    // -- Sketch
+    export const SKETCH = [...MAIN_MENU_BAR, '3_sketch'];
+    export const SKETCH__MAIN_GROUP = [...SKETCH, '0_main'];
+    export const SKETCH__UTILS_GROUP = [...SKETCH, '1_utils'];
+
+    // -- Tools
+    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, '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'];
+
+    // ------------
+
+    // 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'];
+
+    // -- 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'];
+    // `Previous Tab`, `Next Tab`
+    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'];
+
+}
+
+/**
+ * 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/menu/browser-arduino-menu-module.ts

@@ -1,10 +0,0 @@
-import { BrowserMenuBarContribution } from '@theia/core/lib/browser/menu/browser-menu-plugin';
-import { ArduinoMenuContribution } from './arduino-menu-contribution';
-import { ContainerModule, interfaces } from 'inversify';
-
-import '../../../src/browser/style/browser-menu.css'
-
-export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Unbind) => {
-    unbind(BrowserMenuBarContribution);
-    bind(BrowserMenuBarContribution).to(ArduinoMenuContribution).inSingletonScope();
-});

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

@@ -1,13 +1,15 @@
 import { injectable, inject, postConstruct } from 'inversify';
+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 { BoardsServiceClientImpl } from '../boards/boards-service-client-impl';
-import { Port, Board, BoardsService, AttachedSerialBoard, AttachedBoardsChangeEvent } from '../../common/protocol/boards-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 { MonitorServiceClientImpl } from './monitor-service-client-impl';
 import { BoardsConfig } from '../boards/boards-config';
 import { MonitorModel } from './monitor-model';
+import { NotificationCenter } from '../notification-center';
 
 @injectable()
 export class MonitorConnection {
@@ -24,8 +26,11 @@ export class MonitorConnection {
     @inject(BoardsService)
     protected readonly boardsService: BoardsService;
 
-    @inject(BoardsServiceClientImpl)
-    protected boardsServiceClient: BoardsServiceClientImpl;
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceProvider: BoardsServiceProvider;
+
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
 
     @inject(MessageService)
     protected messageService: MessageService;
@@ -43,7 +48,7 @@ export class MonitorConnection {
     /**
      * 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,
@@ -55,12 +60,6 @@ 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 => {
             let shouldReconnect = false;
             if (this.state) {
@@ -109,13 +108,13 @@ export class MonitorConnection {
                 }
             }
         });
-        this.boardsServiceClient.onBoardsConfigChanged(this.handleBoardConfigChange.bind(this));
-        this.boardsServiceClient.onBoardsChanged(event => {
+        this.boardsServiceProvider.onBoardsConfigChanged(this.handleBoardConfigChange.bind(this));
+        this.notificationCenter.onAttachedBoardsChanged(event => {
             if (this.autoConnect && this.connected) {
-                const { boardsConfig } = this.boardsServiceClient;
-                if (this.boardsServiceClient.canUploadTo(boardsConfig, { silent: false })) {
+                const { boardsConfig } = this.boardsServiceProvider;
+                if (this.boardsServiceProvider.canUploadTo(boardsConfig, { silent: false })) {
                     const { attached } = AttachedBoardsChangeEvent.diff(event);
-                    if (attached.boards.some(board => AttachedSerialBoard.is(board) && BoardsConfig.Config.sameAs(boardsConfig, board))) {
+                    if (attached.boards.some(board => !!board.port && BoardsConfig.Config.sameAs(boardsConfig, board))) {
                         const { selectedBoard: board, selectedPort: port } = boardsConfig;
                         const { baudRate } = this.monitorModel;
                         this.disconnect()
@@ -127,7 +126,7 @@ export class MonitorConnection {
         // Handles the `baudRate` changes by reconnecting if required.
         this.monitorModel.onChange(({ property }) => {
             if (property === 'baudRate' && this.autoConnect && this.connected) {
-                const { boardsConfig } = this.boardsServiceClient;
+                const { boardsConfig } = this.boardsServiceProvider;
                 this.handleBoardConfigChange(boardsConfig);
             }
         });
@@ -153,7 +152,7 @@ export class MonitorConnection {
             // 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.boardsServiceClient;
+                const { boardsConfig } = this.boardsServiceProvider;
                 this.handleBoardConfigChange(boardsConfig);
             });
         } else if (oldValue && !value) {
@@ -174,6 +173,15 @@ export class MonitorConnection {
         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)}.`);
         }
@@ -182,15 +190,19 @@ export class MonitorConnection {
     }
 
     async disconnect(): Promise<Status> {
-        if (!this.state) { // XXX: we user `this.state` instead of `this.connected` to make the type checker happy. 
+        if (!this.connected) {
+            return Status.OK;
+        }
+        const stateCopy = deepClone(this.state);
+        if (!stateCopy) {
             return Status.OK;
         }
         console.log('>>> Disposing existing monitor connection...');
         const status = await this.monitorService.disconnect();
         if (Status.isOK(status)) {
-            console.log(`<<< Disposed connection. Was: ${MonitorConnection.State.toString(this.state)}`);
+            console.log(`<<< Disposed connection. Was: ${MonitorConnection.State.toString(stateCopy)}`);
         } else {
-            console.warn(`<<< Could not dispose connection. Activate connection: ${MonitorConnection.State.toString(this.state)}`);
+            console.warn(`<<< Could not dispose connection. Activate connection: ${MonitorConnection.State.toString(stateCopy)}`);
         }
         this.state = undefined;
         this.onConnectionChangedEmitter.fire(this.state);
@@ -216,16 +228,16 @@ 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> {
         if (this.autoConnect) {
-            if (this.boardsServiceClient.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 }) => {
+                this.boardsService.getAvailablePorts().then(ports => {
                     if (ports.some(port => Port.equals(port, boardsConfig.selectedPort))) {
                         new Promise<void>(resolve => {
                             // First, disconnect if connected.

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

@@ -2,7 +2,7 @@ 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 { BoardsServiceClientImpl } from '../boards/boards-service-client-impl';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
 
 @injectable()
 export class MonitorModel implements FrontendApplicationContribution {
@@ -12,8 +12,8 @@ export class MonitorModel implements FrontendApplicationContribution {
     @inject(LocalStorageService)
     protected readonly localStorageService: LocalStorageService;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClient: BoardsServiceProvider;
 
     protected readonly onChangeEmitter: Emitter<MonitorModel.State.Change<keyof MonitorModel.State>>;
     protected _autoscroll: boolean;

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

@@ -1,21 +1,13 @@
 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

@@ -1,12 +1,12 @@
 import * as React from 'react';
-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 { ArduinoMenus } from "../arduino-frontend-contribution";
-import { TabBarToolbarContribution, TabBarToolbarRegistry } from "@theia/core/lib/browser/shell/tab-bar-toolbar";
-import { MonitorModel } from './monitor-model';
+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 { ArduinoToolbar } from '../toolbar/arduino-toolbar';
+import { MonitorModel } from './monitor-model';
+import { ArduinoMenus } from '../menu/arduino-menus';
 
 export namespace SerialMonitor {
     export namespace Commands {
@@ -29,7 +29,8 @@ export namespace SerialMonitor {
 @injectable()
 export class MonitorViewContribution extends AbstractViewContribution<MonitorWidget> implements TabBarToolbarContribution {
 
-    static readonly OPEN_SERIAL_MONITOR = MonitorWidget.ID + ':toggle';
+    static readonly TOGGLE_SERIAL_MONITOR = MonitorWidget.ID + ':toggle';
+    static readonly TOGGLE_SERIAL_MONITOR_TOOLBAR = MonitorWidget.ID + ':toggle-toolbar';
 
     @inject(MonitorModel) protected readonly model: MonitorModel;
 
@@ -40,16 +41,17 @@ export class MonitorViewContribution extends AbstractViewContribution<MonitorWid
             defaultWidgetOptions: {
                 area: 'bottom'
             },
-            toggleCommandId: MonitorViewContribution.OPEN_SERIAL_MONITOR,
-            toggleKeybinding: 'ctrl+shift+m'
+            toggleCommandId: MonitorViewContribution.TOGGLE_SERIAL_MONITOR,
+            toggleKeybinding: 'CtrlCmd+Shift+M'
         })
     }
 
     registerMenus(menus: MenuModelRegistry): void {
         if (this.toggleCommand) {
-            menus.registerMenuAction(ArduinoMenus.TOOLS, {
+            menus.registerMenuAction(ArduinoMenus.TOOLS__MAIN_GROUP, {
                 commandId: this.toggleCommand.id,
-                label: 'Serial Monitor'
+                label: 'Serial Monitor',
+                order: '5'
             });
         }
     }
@@ -85,16 +87,23 @@ export class MonitorViewContribution extends AbstractViewContribution<MonitorWid
             }
         });
         if (this.toggleCommand) {
-            commands.registerCommand(this.toggleCommand, {
-                execute: () => this.openView({
-                    toggle: true,
-                    activate: true
-                }),
-                isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'right'
+            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()
             });
         }
     }
 
+    protected async toggle(): Promise<void> {
+        const widget = this.tryGetWidget();
+        if (widget) {
+            widget.dispose();
+        } else {
+            await this.openView({ activate: true, reveal: true });
+        }
+    }
+
     protected renderAutoScrollButton(): React.ReactNode {
         return <React.Fragment key='autoscroll-toolbar-item'>
             <div

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

@@ -5,11 +5,11 @@ 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 } from '@theia/core/lib/common/disposable'
+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 '../components/arduino-select';
+import { ArduinoSelect } from '../widgets/arduino-select';
 import { MonitorModel } from './monitor-model';
 import { MonitorConnection } from './monitor-connection';
 import { MonitorServiceClientImpl } from './monitor-service-client-impl';
@@ -45,10 +45,16 @@ export class MonitorWidget extends ReactWidget {
         super();
         this.id = MonitorWidget.ID;
         this.title.label = 'Serial Monitor';
-        this.title.iconClass = 'arduino-serial-monitor-tab-icon';
+        this.title.iconClass = 'monitor-tab-icon';
         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();
+            }
+        }));
     }
 
     @postConstruct()
@@ -73,10 +79,6 @@ export class MonitorWidget extends ReactWidget {
 
     onCloseRequest(msg: Message): void {
         this.closing = true;
-        this.monitorConnection.autoConnect = false;
-        if (this.monitorConnection.connected) {
-            this.monitorConnection.disconnect();
-        }
         super.onCloseRequest(msg);
     }
 
@@ -100,6 +102,9 @@ export class MonitorWidget extends ReactWidget {
     }
 
     protected onFocusResolved = (element: HTMLElement | undefined) => {
+        if (this.closing || !this.isAttached) {
+            return;
+        }
         this.focusNode = element;
         requestAnimationFrame(() => MessageLoop.sendMessage(this, Widget.Msg.ActivateRequest));
     }
@@ -178,7 +183,7 @@ export class MonitorWidget extends ReactWidget {
         this.monitorModel.lineEnding = option.value;
     }
 
-    protected readonly onChangeBaudRate = async (option: SelectOption<MonitorConfig.BaudRate>) => {
+    protected readonly onChangeBaudRate = (option: SelectOption<MonitorConfig.BaudRate>) => {
         this.monitorModel.baudRate = option.value;
     }
 
@@ -209,7 +214,7 @@ export class SerialMonitorSendInput extends React.Component<SerialMonitorSendInp
         return <input
             ref={this.setRef}
             type='text'
-            className={this.props.monitorConfig ? '' : 'warning'}
+            className={`theia-input ${this.props.monitorConfig ? '' : 'warning'}`}
             placeholder={this.placeholder}
             value={this.state.text}
             onChange={this.onChange}
@@ -288,17 +293,20 @@ export class SerialMonitorOutput extends React.Component<SerialMonitorOutput.Pro
 
     componentDidMount(): void {
         this.scrollToBottom();
-        let chunk = '';
         this.toDisposeBeforeUnmount.pushAll([
-            this.props.monitorConnection.onRead(({ data }) => {
-                chunk += data;
-                const eolIndex = chunk.indexOf('\n');
-                if (eolIndex !== -1) {
-                    const line = chunk.substring(0, eolIndex + 1);
-                    chunk = chunk.slice(eolIndex + 1);
-                    const content = `${this.state.content}${this.state.timestamp ? `${dateFormat(new Date(), 'H:M:ss.l')} -> ` : ''}${line}`;
-                    this.setState({ content });
+            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]);
+                    } else {
+                        lines.push(timestamp() + rawLines[i]);
+                    }
                 }
+                const content = this.state.content + lines.join('\n');
+                this.setState({ content });
             }),
             this.props.clearConsoleEvent(() => this.setState({ content: '' })),
             this.props.monitorModel.onChange(({ property }) => {

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

@@ -0,0 +1,98 @@
+import { inject, injectable, postConstruct } from 'inversify';
+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, Sketch } from '../common/protocol';
+
+@injectable()
+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 recentSketchesChangedEmitter = new Emitter<{ sketches: Sketch[] }>();
+
+    protected readonly toDispose = new DisposableCollection(
+        this.indexUpdatedEmitter,
+        this.daemonStartedEmitter,
+        this.daemonStoppedEmitter,
+        this.configChangedEmitter,
+        this.platformInstalledEmitter,
+        this.platformUninstalledEmitter,
+        this.libraryInstalledEmitter,
+        this.libraryUninstalledEmitter,
+        this.attachedBoardsChangedEmitter
+    );
+
+    readonly onIndexUpdated = this.indexUpdatedEmitter.event;
+    readonly onDaemonStarted = this.daemonStartedEmitter.event;
+    readonly onDaemonStopped = this.daemonStoppedEmitter.event;
+    readonly onConfigChanged = this.configChangedEmitter.event;
+    readonly onPlatformInstalled = this.platformInstalledEmitter.event;
+    readonly onPlatformUninstalled = this.platformUninstalledEmitter.event;
+    readonly onLibraryInstalled = this.libraryInstalledEmitter.event;
+    readonly onLibraryUninstalled = this.libraryUninstalledEmitter.event;
+    readonly onAttachedBoardsChanged = this.attachedBoardsChangedEmitter.event;
+    readonly onRecentSketchesChanged = this.recentSketchesChangedEmitter.event;
+
+    @postConstruct()
+    protected init(): void {
+        this.server.setClient(this);
+    }
+
+    onStop(): void {
+        this.toDispose.dispose();
+    }
+
+    notifyIndexUpdated(): void {
+        this.indexUpdatedEmitter.fire();
+    }
+
+    notifyDaemonStarted(): void {
+        this.daemonStartedEmitter.fire();
+    }
+
+    notifyDaemonStopped(): void {
+        this.daemonStoppedEmitter.fire();
+    }
+
+    notifyConfigChanged(event: { config: Config | undefined }): void {
+        this.configChangedEmitter.fire(event);
+    }
+
+    notifyPlatformInstalled(event: { item: BoardsPackage }): void {
+        this.platformInstalledEmitter.fire(event);
+    }
+
+    notifyPlatformUninstalled(event: { item: BoardsPackage }): void {
+        this.platformUninstalledEmitter.fire(event);
+    }
+
+    notifyLibraryInstalled(event: { item: LibraryPackage }): void {
+        this.libraryInstalledEmitter.fire(event);
+    }
+
+    notifyLibraryUninstalled(event: { item: LibraryPackage }): void {
+        this.libraryUninstalledEmitter.fire(event);
+    }
+
+    notifyAttachedBoardsChanged(event: AttachedBoardsChangeEvent): void {
+        this.attachedBoardsChangedEmitter.fire(event);
+    }
+
+    notifyRecentSketchesChanged(event: { sketches: Sketch[] }): void {
+        this.recentSketchesChangedEmitter.fire(event);
+    }
+
+}

arduino-ide-extension/src/browser/output-service-impl.ts

@@ -0,0 +1,22 @@
+import { inject, injectable } from 'inversify';
+import { OutputContribution } from '@theia/output/lib/browser/output-contribution';
+import { OutputChannelManager } from '@theia/output/lib/common/output-channel';
+import { OutputService, OutputMessage } from '../common/protocol/output-service';
+
+@injectable()
+export class OutputServiceImpl implements OutputService {
+
+    @inject(OutputContribution)
+    protected outputContribution: OutputContribution;
+
+    @inject(OutputChannelManager)
+    protected outputChannelManager: OutputChannelManager;
+
+    append(message: OutputMessage): void {
+        const { chunk } = message;
+        const channel = this.outputChannelManager.getChannel('Arduino');
+        channel.show({ preserveFocus: true });
+        channel.append(chunk);
+    }
+
+}

arduino-ide-extension/src/browser/settings.tsx

@@ -0,0 +1,846 @@
+import * as React from 'react';
+import { injectable, inject, postConstruct } from 'inversify';
+import { Widget } from '@phosphor/widgets';
+import { Message } from '@phosphor/messaging';
+import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
+import 'react-tabs/style/react-tabs.css';
+import { Disable } from 'react-disable';
+import URI from '@theia/core/lib/common/uri';
+import { Emitter } from '@theia/core/lib/common/event';
+import { Deferred } from '@theia/core/lib/common/promise-util';
+import { deepClone } from '@theia/core/lib/common/objects';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { ThemeService } from '@theia/core/lib/browser/theming';
+import { MaybePromise } from '@theia/core/lib/common/types';
+import { WindowService } from '@theia/core/lib/browser/window/window-service';
+import { FileDialogService } from '@theia/filesystem/lib/browser/file-dialog/file-dialog-service';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import { AbstractDialog, DialogProps, PreferenceService, PreferenceScope, DialogError, ReactWidget } from '@theia/core/lib/browser';
+import { Index } from '../common/types';
+import { CompilerWarnings, CompilerWarningLiterals, ConfigService, FileSystemExt, Network, ProxySettings } from '../common/protocol';
+
+export interface Settings extends Index {
+    editorFontSize: number; // `editor.fontSize`
+    themeId: string; // `workbench.colorTheme`
+    autoSave: 'on' | 'off'; // `editor.autoSave`
+    quickSuggestions: Record<'other'|'comments'|'strings', boolean>; // `editor.quickSuggestions`
+
+    autoScaleInterface: boolean; // `arduino.window.autoScale`
+    interfaceScale: number; // `arduino.window.zoomLevel` https://github.com/eclipse-theia/theia/issues/8751
+    checkForUpdates?: boolean; // `arduino.ide.autoUpdate`
+    verboseOnCompile: boolean; // `arduino.compile.verbose`
+    compilerWarnings: CompilerWarnings; // `arduino.compile.warnings`
+    verboseOnUpload: boolean; // `arduino.upload.verbose`
+    verifyAfterUpload: boolean; // `arduino.upload.verify`
+    enableLsLogs: boolean; // `arduino.language.log`
+
+    sketchbookPath: string; // CLI
+    additionalUrls: string[]; // CLI
+    network: Network; // CLI
+}
+export namespace Settings {
+
+    export function belongsToCli<K extends keyof Settings>(key: K): boolean {
+        return key === 'sketchbookPath' || key === 'additionalUrls';
+    }
+
+}
+
+@injectable()
+export class SettingsService {
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    @inject(FileSystemExt)
+    protected readonly fileSystemExt: FileSystemExt;
+
+    @inject(ConfigService)
+    protected readonly configService: ConfigService;
+
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
+    @inject(FrontendApplicationStateService)
+    protected readonly appStateService: FrontendApplicationStateService;
+
+    protected readonly onDidChangeEmitter = new Emitter<Readonly<Settings>>();
+    readonly onDidChange = this.onDidChangeEmitter.event;
+
+    protected ready = new Deferred<void>();
+    protected _settings: Settings;
+
+    @postConstruct()
+    protected async init(): Promise<void> {
+        await this.appStateService.reachedState('ready'); // Hack for https://github.com/eclipse-theia/theia/issues/8993
+        const settings = await this.loadSettings();
+        this._settings = deepClone(settings);
+        this.ready.resolve();
+    }
+
+    protected async loadSettings(): Promise<Settings> {
+        await this.preferenceService.ready;
+        const [
+            editorFontSize,
+            themeId,
+            autoSave,
+            quickSuggestions,
+            autoScaleInterface,
+            interfaceScale,
+            // checkForUpdates,
+            verboseOnCompile,
+            compilerWarnings,
+            verboseOnUpload,
+            verifyAfterUpload,
+            enableLsLogs,
+            cliConfig
+        ] = await Promise.all([
+            this.preferenceService.get<number>('editor.fontSize', 12),
+            this.preferenceService.get<string>('workbench.colorTheme', 'arduino-theme'),
+            this.preferenceService.get<'on' | 'off'>('editor.autoSave', 'on'),
+            this.preferenceService.get<object>('editor.quickSuggestion', {
+              'other': false,
+              'comments': false,
+              'strings': false
+            }),
+            this.preferenceService.get<boolean>('arduino.window.autoScale', true),
+            this.preferenceService.get<number>('arduino.window.zoomLevel', 0),
+            // this.preferenceService.get<string>('arduino.ide.autoUpdate', true),
+            this.preferenceService.get<boolean>('arduino.compile.verbose', true),
+            this.preferenceService.get<any>('arduino.compile.warnings', 'None'),
+            this.preferenceService.get<boolean>('arduino.upload.verbose', true),
+            this.preferenceService.get<boolean>('arduino.upload.verify', true),
+            this.preferenceService.get<boolean>('arduino.language.log', true),
+            this.configService.getConfiguration()
+        ]);
+        const { additionalUrls, sketchDirUri, network } = cliConfig;
+        const sketchbookPath = await this.fileService.fsPath(new URI(sketchDirUri));
+        return {
+            editorFontSize,
+            themeId,
+            autoSave,
+            quickSuggestions,
+            autoScaleInterface,
+            interfaceScale,
+            // checkForUpdates,
+            verboseOnCompile,
+            compilerWarnings,
+            verboseOnUpload,
+            verifyAfterUpload,
+            enableLsLogs,
+            additionalUrls,
+            sketchbookPath,
+            network
+        };
+    }
+
+    async settings(): Promise<Settings> {
+        await this.ready.promise;
+        return this._settings;
+    }
+
+    async update(settings: Settings, fireDidChange: boolean = false): Promise<void> {
+        await this.ready.promise;
+        for (const key of Object.keys(settings)) {
+            this._settings[key] = settings[key];
+        }
+        if (fireDidChange) {
+            this.onDidChangeEmitter.fire(this._settings);
+        }
+    }
+
+    async reset(): Promise<void> {
+        const settings = await this.loadSettings();
+        return this.update(settings, true);
+    }
+
+    async validate(settings: MaybePromise<Settings> = this.settings()): Promise<string | true> {
+        try {
+            const { sketchbookPath, editorFontSize, themeId } = await settings;
+            const sketchbookDir = await this.fileSystemExt.getUri(sketchbookPath);
+            if (!await this.fileService.exists(new URI(sketchbookDir))) {
+                return `Invalid sketchbook location: ${sketchbookPath}`;
+            }
+            if (editorFontSize <= 0) {
+                return 'Invalid editor font size. It must be a positive integer.';
+            }
+            if (!ThemeService.get().getThemes().find(({ id }) => id === themeId)) {
+                return 'Invalid theme.';
+            }
+            return true;
+        } catch (err) {
+            if (err instanceof Error) {
+                return err.message;
+            }
+            return String(err);
+        }
+    }
+
+    async save(): Promise<string | true> {
+        await this.ready.promise;
+        const {
+            editorFontSize,
+            themeId,
+            autoSave,
+            quickSuggestions,
+            autoScaleInterface,
+            interfaceScale,
+            // checkForUpdates,
+            verboseOnCompile,
+            compilerWarnings,
+            verboseOnUpload,
+            verifyAfterUpload,
+            enableLsLogs,
+            sketchbookPath,
+            additionalUrls,
+            network
+        } = this._settings;
+        const [config, sketchDirUri] = await Promise.all([
+            this.configService.getConfiguration(),
+            this.fileSystemExt.getUri(sketchbookPath)
+        ]);
+        (config as any).additionalUrls = additionalUrls;
+        (config as any).sketchDirUri = sketchDirUri;
+        (config as any).network = network;
+
+        await Promise.all([
+            this.preferenceService.set('editor.fontSize', editorFontSize, PreferenceScope.User),
+            this.preferenceService.set('workbench.colorTheme', themeId, PreferenceScope.User),
+            this.preferenceService.set('editor.autoSave', autoSave, PreferenceScope.User),
+            this.preferenceService.set('editor.quickSuggestions', quickSuggestions, PreferenceScope.User),
+            this.preferenceService.set('arduino.window.autoScale', autoScaleInterface, PreferenceScope.User),
+            this.preferenceService.set('arduino.window.zoomLevel', interfaceScale, PreferenceScope.User),
+            // this.preferenceService.set('arduino.ide.autoUpdate', checkForUpdates, PreferenceScope.User),
+            this.preferenceService.set('arduino.compile.verbose', verboseOnCompile, PreferenceScope.User),
+            this.preferenceService.set('arduino.compile.warnings', compilerWarnings, PreferenceScope.User),
+            this.preferenceService.set('arduino.upload.verbose', verboseOnUpload, PreferenceScope.User),
+            this.preferenceService.set('arduino.upload.verify', verifyAfterUpload, PreferenceScope.User),
+            this.preferenceService.set('arduino.language.log', enableLsLogs, PreferenceScope.User),
+            this.configService.setConfiguration(config)
+        ]);
+        this.onDidChangeEmitter.fire(this._settings);
+        return true;
+    }
+
+}
+
+export class SettingsComponent extends React.Component<SettingsComponent.Props, SettingsComponent.State> {
+
+    readonly toDispose = new DisposableCollection();
+
+    constructor(props: SettingsComponent.Props) {
+        super(props);
+    }
+
+    componentDidUpdate(_: SettingsComponent.Props, prevState: SettingsComponent.State): void {
+        if (this.state && prevState && JSON.stringify(this.state) !== JSON.stringify(prevState)) {
+            this.props.settingsService.update(this.state, true);
+        }
+    }
+
+    componentDidMount(): void {
+        this.props.settingsService.settings().then(settings => this.setState(settings));
+        this.toDispose.push(this.props.settingsService.onDidChange(settings => this.setState(settings)));
+    }
+
+    componentWillUnmount(): void {
+        this.toDispose.dispose();
+    }
+
+    render(): React.ReactNode {
+        if (!this.state) {
+            return <div />;
+        }
+        return <Tabs>
+            <TabList>
+                <Tab>Settings</Tab>
+                <Tab>Network</Tab>
+            </TabList>
+            <TabPanel>
+                {this.renderSettings()}
+            </TabPanel>
+            <TabPanel>
+                {this.renderNetwork()}
+            </TabPanel>
+        </Tabs>;
+    }
+
+    protected renderSettings(): React.ReactNode {
+        return <div className='content noselect'>
+            Sketchbook location:
+            <div className='flex-line'>
+                <input
+                    className='theia-input stretch'
+                    type='text'
+                    value={this.state.sketchbookPath}
+                    onChange={this.sketchpathDidChange} />
+                <button className='theia-button shrink' onClick={this.browseSketchbookDidClick}>Browse</button>
+            </div>
+            <div className='flex-line'>
+                <div className='column'>
+                    <div className='flex-line'>Editor font size:</div>
+                    <div className='flex-line'>Interface scale:</div>
+                    <div className='flex-line'>Theme:</div>
+                    <div className='flex-line'>Show verbose output during:</div>
+                    <div className='flex-line'>Compiler warnings:</div>
+                </div>
+                <div className='column'>
+                    <div className='flex-line'>
+                        <input
+                            className='theia-input small'
+                            type='number'
+                            step={1}
+                            pattern='[0-9]+'
+                            onKeyDown={this.numbersOnlyKeyDown}
+                            value={this.state.editorFontSize}
+                            onChange={this.editorFontSizeDidChange} />
+                    </div>
+                    <div className='flex-line'>
+                        <label className='flex-line'>
+                            <input
+                                type='checkbox'
+                                checked={this.state.autoScaleInterface}
+                                onChange={this.autoScaleInterfaceDidChange} />
+                            Automatic
+                        </label>
+                        <input
+                            className='theia-input small with-margin'
+                            type='number'
+                            step={20}
+                            pattern='[0-9]+'
+                            onKeyDown={this.noopKeyDown}
+                            value={100 + this.state.interfaceScale * 20}
+                            onChange={this.interfaceScaleDidChange} />
+                        %
+                    </div>
+                    <div className='flex-line'>
+                        <select
+                            className='theia-select'
+                            value={ThemeService.get().getThemes().find(({ id }) => id === this.state.themeId)?.label || 'Unknown'}
+                            onChange={this.themeDidChange}>
+                            {ThemeService.get().getThemes().map(({ id, label }) => <option key={id} value={label}>{label}</option>)}
+                        </select>
+                    </div>
+                    <div className='flex-line'>
+                        <label className='flex-line'>
+                            <input
+                                type='checkbox'
+                                checked={this.state.verboseOnCompile}
+                                onChange={this.verboseOnCompileDidChange} />
+                            compile
+                        </label>
+                        <label className='flex-line'>
+                            <input
+                                type='checkbox'
+                                checked={this.state.verboseOnUpload}
+                                onChange={this.verboseOnUploadDidChange} />
+                            upload
+                        </label>
+                    </div>
+                    <div className='flex-line'>
+                        <select
+                            className='theia-select'
+                            value={this.state.compilerWarnings}
+                            onChange={this.compilerWarningsDidChange}>
+                            {CompilerWarningLiterals.map(value => <option key={value} value={value}>{value}</option>)}
+                        </select>
+                    </div>
+                </div>
+            </div>
+            <label className='flex-line'>
+                <input
+                    type='checkbox'
+                    checked={this.state.verifyAfterUpload}
+                    onChange={this.verifyAfterUploadDidChange} />
+                Verify code after upload
+            </label>
+            <label className='flex-line'>
+                <input
+                    type='checkbox'
+                    checked={this.state.checkForUpdates}
+                    onChange={this.checkForUpdatesDidChange}
+                    disabled={true} />
+                Check for updates on startup
+            </label>
+            <label className='flex-line'>
+                <input
+                    type='checkbox'
+                    checked={this.state.autoSave === 'on'}
+                    onChange={this.autoSaveDidChange} />
+                Auto save
+            </label>
+            <label className='flex-line'>
+                <input
+                    type='checkbox'
+                    checked={this.state.quickSuggestions.other === true}
+                    onChange={this.quickSuggestionsOtherDidChange} />
+                Editor Quick Suggestions
+            </label>
+            <label className='flex-line'>
+                <input
+                    type='checkbox'
+                    checked={this.state.enableLsLogs}
+                    onChange={this.enableLsLogsDidChange} />
+                Enable language server logging
+            </label>
+            <div className='flex-line'>
+                Additional boards manager URLs:
+                <input
+                    className='theia-input stretch with-margin'
+                    type='text'
+                    value={this.state.additionalUrls.join(',')}
+                    onChange={this.additionalUrlsDidChange} />
+                <i className='fa fa-window-restore theia-button shrink' onClick={this.editAdditionalUrlDidClick} />
+            </div>
+        </div>;
+    }
+
+    protected renderNetwork(): React.ReactNode {
+        return <div className='content noselect'>
+            <form>
+                <label className='flex-line'>
+                    <input
+                        type='radio'
+                        checked={this.state.network === 'none'}
+                        onChange={this.noProxyDidChange} />
+                    No proxy
+                </label>
+                <label className='flex-line'>
+                    <input
+                        type='radio'
+                        checked={this.state.network !== 'none'}
+                        onChange={this.manualProxyDidChange} />
+                    Manual proxy configuration
+                </label>
+            </form>
+            {this.renderProxySettings()}
+        </div>;
+    }
+
+    protected renderProxySettings(): React.ReactNode {
+        const disabled = this.state.network === 'none';
+        return <Disable disabled={disabled}>
+            <div className='proxy-settings' aria-disabled={disabled}>
+                <form className='flex-line'>
+                    <input
+                        type='radio'
+                        checked={this.state.network === 'none' ? true : this.state.network.protocol === 'http'}
+                        onChange={this.httpProtocolDidChange} />
+                        HTTP
+                    <label className='flex-line'>
+                        <input
+                            type='radio'
+                            checked={this.state.network === 'none' ? false : this.state.network.protocol !== 'http'}
+                            onChange={this.socksProtocolDidChange} />
+                        SOCKS
+                    </label>
+                </form>
+                <div className='flex-line proxy-settings'>
+                    <div className='column'>
+                        <div className='flex-line'>Host name:</div>
+                        <div className='flex-line'>Port number:</div>
+                        <div className='flex-line'>Username:</div>
+                        <div className='flex-line'>Password:</div>
+                    </div>
+                    <div className='column stretch'>
+                        <div className='flex-line'>
+                            <input
+                                className='theia-input stretch with-margin'
+                                type='text'
+                                value={this.state.network === 'none' ? '' : this.state.network.hostname}
+                                onChange={this.hostnameDidChange} />
+                        </div>
+                        <div className='flex-line'>
+                            <input
+                                className='theia-input small with-margin'
+                                type='number'
+                                pattern='[0-9]'
+                                value={this.state.network === 'none' ? '' : this.state.network.port}
+                                onKeyDown={this.numbersOnlyKeyDown}
+                                onChange={this.portDidChange} />
+                        </div>
+                        <div className='flex-line'>
+                            <input
+                                className='theia-input stretch with-margin'
+                                type='text'
+                                value={this.state.network === 'none' ? '' : this.state.network.username}
+                                onChange={this.usernameDidChange} />
+                        </div>
+                        <div className='flex-line'>
+                            <input
+                                className='theia-input stretch with-margin'
+                                type='password'
+                                value={this.state.network === 'none' ? '' : this.state.network.password}
+                                onChange={this.passwordDidChange} />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </Disable>;
+    }
+
+    private isControlKey(event: React.KeyboardEvent<HTMLInputElement>): boolean {
+        return !!event.key && ['tab', 'delete', 'backspace', 'arrowleft', 'arrowright'].some(key => event.key.toLocaleLowerCase() === key);
+    }
+
+    protected noopKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+        if (this.isControlKey(event)) {
+            return;
+        }
+        event.nativeEvent.preventDefault();
+        event.nativeEvent.returnValue = false;
+    }
+
+    protected numbersOnlyKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
+        if (this.isControlKey(event)) {
+            return;
+        }
+        const key = Number(event.key)
+        if (isNaN(key) || event.key === null || event.key === ' ') {
+            event.nativeEvent.preventDefault();
+            event.nativeEvent.returnValue = false;
+            return;
+        }
+    }
+
+    protected browseSketchbookDidClick = async () => {
+        const uri = await this.props.fileDialogService.showOpenDialog({
+            title: 'Select new sketchbook location',
+            openLabel: 'Chose',
+            canSelectFiles: false,
+            canSelectMany: false,
+            canSelectFolders: true
+        });
+        if (uri) {
+            const sketchbookPath = await this.props.fileService.fsPath(uri);
+            this.setState({ sketchbookPath });
+        }
+    };
+
+    protected editAdditionalUrlDidClick = async () => {
+        const additionalUrls = await new AdditionalUrlsDialog(this.state.additionalUrls, this.props.windowService).open();
+        if (additionalUrls) {
+            this.setState({ additionalUrls });
+        }
+    };
+
+    protected editorFontSizeDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        const { value } = event.target;
+        if (value) {
+            this.setState({ editorFontSize: parseInt(value, 10) });
+        }
+    };
+
+    protected additionalUrlsDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        this.setState({ additionalUrls: event.target.value.split(',').map(url => url.trim()) });
+    };
+
+    protected autoScaleInterfaceDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        this.setState({ autoScaleInterface: event.target.checked });
+    };
+
+    protected enableLsLogsDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        this.setState({ enableLsLogs: event.target.checked });
+    };
+
+    protected interfaceScaleDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        const { value } = event.target;
+        const percentage = parseInt(value, 10);
+        if (isNaN(percentage)) {
+            return;
+        }
+        let interfaceScale = (percentage - 100) / 20;
+        if (!isNaN(interfaceScale)) {
+            this.setState({ interfaceScale });
+        }
+    };
+
+    protected verifyAfterUploadDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        this.setState({ verifyAfterUpload: event.target.checked });
+    };
+
+    protected checkForUpdatesDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        this.setState({ checkForUpdates: event.target.checked });
+    };
+
+    protected autoSaveDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        this.setState({ autoSave: event.target.checked ? 'on' : 'off' });
+    };
+
+    protected quickSuggestionsOtherDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+      
+      // need to persist react events through lifecycle https://reactjs.org/docs/events.html#event-pooling
+      const newVal = event.target.checked ? true : false
+      
+      this.setState(prevState => {
+        return {
+          quickSuggestions: {
+            ...prevState.quickSuggestions,
+            other: newVal
+          }
+        }
+      });
+    };
+
+    protected themeDidChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
+        const { selectedIndex } = event.target.options;
+        const theme = ThemeService.get().getThemes()[selectedIndex];
+        if (theme) {
+            this.setState({ themeId: theme.id });
+        }
+    };
+
+    protected compilerWarningsDidChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
+        const { selectedIndex } = event.target.options;
+        const compilerWarnings = CompilerWarningLiterals[selectedIndex];
+        if (compilerWarnings) {
+            this.setState({ compilerWarnings });
+        }
+    };
+
+    protected verboseOnCompileDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        this.setState({ verboseOnCompile: event.target.checked });
+    };
+
+    protected verboseOnUploadDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        this.setState({ verboseOnUpload: event.target.checked });
+    };
+
+    protected sketchpathDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        const sketchbookPath = event.target.value;
+        if (sketchbookPath) {
+            this.setState({ sketchbookPath });
+        }
+    };
+
+    protected noProxyDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        if (event.target.checked) {
+            this.setState({ network: 'none' });
+        } else {
+            this.setState({ network: Network.Default() });
+        }
+    };
+
+    protected manualProxyDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        if (event.target.checked) {
+            this.setState({ network: Network.Default() });
+        } else {
+            this.setState({ network: 'none' });
+        }
+    };
+
+    protected httpProtocolDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        if (this.state.network !== 'none') {
+            const network = this.cloneProxySettings;
+            network.protocol = event.target.checked ? 'http' : 'socks';
+            this.setState({ network });
+        }
+    };
+
+    protected socksProtocolDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        if (this.state.network !== 'none') {
+            const network = this.cloneProxySettings;
+            network.protocol = event.target.checked ? 'socks' : 'http';
+            this.setState({ network });
+        }
+    };
+
+    protected hostnameDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        if (this.state.network !== 'none') {
+            const network = this.cloneProxySettings;
+            network.hostname = event.target.value;
+            this.setState({ network });
+        }
+    };
+
+    protected portDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        if (this.state.network !== 'none') {
+            const network = this.cloneProxySettings;
+            network.port = event.target.value;
+            this.setState({ network });
+        }
+    };
+
+    protected usernameDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        if (this.state.network !== 'none') {
+            const network = this.cloneProxySettings;
+            network.username = event.target.value;
+            this.setState({ network });
+        }
+    };
+
+    protected passwordDidChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        if (this.state.network !== 'none') {
+            const network = this.cloneProxySettings;
+            network.password = event.target.value;
+            this.setState({ network });
+        }
+    };
+
+    private get cloneProxySettings(): ProxySettings {
+        const { network } = this.state;
+        if (network === 'none') {
+            throw new Error('Must be called when proxy is enabled.');
+        }
+        const copyNetwork = deepClone(network);
+        return copyNetwork;
+    }
+
+}
+export namespace SettingsComponent {
+    export interface Props {
+        readonly settingsService: SettingsService;
+        readonly fileService: FileService;
+        readonly fileDialogService: FileDialogService;
+        readonly windowService: WindowService;
+    }
+    export interface State extends Settings { }
+}
+
+@injectable()
+export class SettingsWidget extends ReactWidget {
+
+    @inject(SettingsService)
+    protected readonly settingsService: SettingsService;
+
+    @inject(FileService)
+    protected readonly fileService: FileService;
+
+    @inject(FileDialogService)
+    protected readonly fileDialogService: FileDialogService;
+
+    @inject(WindowService)
+    protected readonly windowService: WindowService;
+
+    protected render(): React.ReactNode {
+        return <SettingsComponent
+            settingsService={this.settingsService}
+            fileService={this.fileService}
+            fileDialogService={this.fileDialogService}
+            windowService={this.windowService} />;
+    }
+
+}
+
+@injectable()
+export class SettingsDialogProps extends DialogProps {
+}
+
+@injectable()
+export class SettingsDialog extends AbstractDialog<Promise<Settings>> {
+
+    @inject(SettingsService)
+    protected readonly settingsService: SettingsService;
+
+    @inject(SettingsWidget)
+    protected readonly widget: SettingsWidget;
+
+    constructor(@inject(SettingsDialogProps) protected readonly props: SettingsDialogProps) {
+        super(props);
+        this.contentNode.classList.add('arduino-settings-dialog');
+        this.appendCloseButton('CANCEL');
+        this.appendAcceptButton('OK');
+    }
+
+    @postConstruct()
+    protected init(): void {
+        this.toDispose.push(this.settingsService.onDidChange(this.validate.bind(this)));
+    }
+
+    protected async isValid(settings: Promise<Settings>): Promise<DialogError> {
+        const result = await this.settingsService.validate(settings);
+        if (typeof result === 'string') {
+            return result;
+        }
+        return '';
+    }
+
+    get value(): Promise<Settings> {
+        return this.settingsService.settings();
+    }
+
+    protected onAfterAttach(msg: Message): void {
+        if (this.widget.isAttached) {
+            Widget.detach(this.widget);
+        }
+        Widget.attach(this.widget, this.contentNode);
+        this.toDisposeOnDetach.push(this.settingsService.onDidChange(() => this.update()));
+        super.onAfterAttach(msg);
+        this.update();
+    }
+
+    protected onUpdateRequest(msg: Message) {
+        super.onUpdateRequest(msg);
+        this.widget.update();
+    }
+
+    protected onActivateRequest(msg: Message): void {
+        super.onActivateRequest(msg);
+        this.widget.activate();
+    }
+
+}
+
+
+export class AdditionalUrlsDialog extends AbstractDialog<string[]> {
+
+    protected readonly textArea: HTMLTextAreaElement;
+
+    constructor(urls: string[], windowService: WindowService) {
+        super({ title: 'Additional Boards Manager URLs' });
+
+        this.contentNode.classList.add('additional-urls-dialog');
+
+        const description = document.createElement('div');
+        description.textContent = 'Enter additional URLs, one for each row';
+        description.style.marginBottom = '5px';
+        this.contentNode.appendChild(description);
+
+        this.textArea = document.createElement('textarea');
+        this.textArea.className = 'theia-input';
+        this.textArea.setAttribute('style', 'flex: 0;');
+        this.textArea.value = urls.filter(url => url.trim()).filter(url => !!url).join('\n');
+        this.textArea.wrap = 'soft';
+        this.textArea.cols = 90;
+        this.textArea.rows = 5;
+        this.contentNode.appendChild(this.textArea);
+
+        const anchor = document.createElement('div');
+        anchor.classList.add('link');
+        anchor.textContent = 'Click for a list of unofficial board support URLs';
+        anchor.style.marginTop = '5px';
+        anchor.style.cursor = 'pointer';
+        this.addEventListener(
+            anchor,
+            'click',
+            () => windowService.openNewWindow('https://github.com/arduino/Arduino/wiki/Unofficial-list-of-3rd-party-boards-support-urls', { external: true })
+        );
+        this.contentNode.appendChild(anchor);
+
+        this.appendAcceptButton('OK');
+        this.appendCloseButton('Cancel');
+    }
+
+    get value(): string[] {
+        return this.textArea.value.split('\n').map(url => url.trim());
+    }
+
+    protected onAfterAttach(message: Message): void {
+        super.onAfterAttach(message);
+        this.addUpdateListener(this.textArea, 'input');
+    }
+
+    protected onActivateRequest(message: Message): void {
+        super.onActivateRequest(message);
+        this.textArea.focus();
+    }
+
+    protected handleEnter(event: KeyboardEvent): boolean | void {
+        if (event.target instanceof HTMLInputElement) {
+            return super.handleEnter(event);
+        }
+        return false;
+    }
+
+}

arduino-ide-extension/src/browser/style/arduino-select.css

@@ -1,10 +1,10 @@
 .arduino-select__control {
-    border: var(--theia-layout-color2) var(--theia-border-width) solid !important;
-    background: var(--theia-layout-color2) !important;
+    border: var(--theia-sideBar-background) var(--theia-border-width) solid !important;
+    background: var(--theia-sideBar-background) !important;
 }
 
 .arduino-select__control:hover {
-    border: var(--theia-layout-color2) var(--theia-border-width) solid !important;
+    border: var(--theia-focusBorder) var(--theia-border-width) solid !important;
 }
 
 .arduino-select__control--is-focused {
@@ -12,31 +12,37 @@
 }
 
 .arduino-select__option--is-selected {
-    background-color: var(--theia-accent-color3) !important;
-    color: var(--theia-content-font-color0) !important;
-    border-color: var(--theia-accent-color3) !important;
+    background-color: var(--theia-list-activeSelectionBackground) !important;
+    color: var(--theia-list-activeSelectionForeground) !important;
+    border-color: var(--theia-focusBorder) !important;
 }
 
 .arduino-select__option--is-focused {
-    background-color: var(--theia-accent-color4) !important;
-    border-color: var(--theia-accent-color3) !important;
+    background-color: var(--theia-list-hoverBackground) !important;
+    border-color: var(--theia-focusBorder) !important;
+}
+
+.arduino-select__option--is-focused.arduino-select__option--is-selected {
+    background-color: var(--theia-list-activeSelectionBackground) !important;
+    color: var(--theia-list-activeSelectionForeground) !important;
+    border-color: var(--theia-focusBorder) !important;
 }
 
 .arduino-select__menu {
-    background-color: var(--theia-layout-color2) !important;
-    border: 1px solid var(--theia-accent-color3) !important;
+    background-color: var(--theia-sideBar-background) !important;
+    border: 1px solid var(--theia-focusBorder) !important;
     top: auto !important; /* to align the top of the menu with the bottom of the control */
     box-shadow: none !important;
 }
 
 .arduino-select__control.arduino-select__control--menu-is-open {
     border: 1px solid !important;
-    border-color: var(--theia-accent-color3) !important;
-    border-bottom-color: var(--theia-layout-color2) !important; /* if the bottom border color has the same color as the background of the control, we make the border "invisible" */
+    border-color: var(--theia-focusBorder) !important;
+    border-bottom-color: var(--theia-sideBar-background) !important; /* if the bottom border color has the same color as the background of the control, we make the border "invisible" */
 }
 
 .arduino-select__value-container .arduino-select__single-value {
-    color: var(--theia-ui-font-color1) !important;
+    color: var(--theia-descriptionForeground) !important;
 }
 
 .arduino-select__menu-list {

arduino-ide-extension/src/browser/style/arduino.useable.css

@@ -1,240 +0,0 @@
-/*
-The following CSS variables define the main public API for styling Theia.
-These variables should be used by all extensions wherever possible. In other
-words, extensions should not define custom colors, sizes, etc. unless
-absolutely necessary. This enables users to adapt the visual theme of Theia
-by changing these variables.
-
-Many variables appear in ordered sequences (0,1,2,...). For most of these
-sequences, colors go from dark to bright for dark themes, and from bright to
-dark for bright themes. A few sequences are used to create contrast against
-the others, e.g. font and accent colors, and thus their brightness goes the
-other way around.
-
-Throughout Theia, we are mostly following principles from Google's Material
-Design when selecting colors. We are not, however, following all of MD as it
-is not optimized for dense, information rich UIs.
-*/
-
-:root {
-    /* Custom Theme Colors */
-    --theia-arduino-light: rgb(0, 100, 104);
-    --theia-arduino-light1: rgb(23, 161, 165);
-    --theia-arduino-light2: rgb(218, 226, 228);
-    --theia-arduino-light3: rgb(237, 241, 242);
-    --theia-arduino-terminal: rgb(0, 0, 0);
-
-    /* Borders: Width and color (bright to dark) */
-    
-    --theia-border-width: 1px;
-    --theia-panel-border-width: 2px;
-    --theia-border-color0: var(--md-grey-100);
-    --theia-border-color1: var(--md-grey-200);
-    --theia-border-color2: var(--md-grey-300);
-    --theia-border-color3: var(--md-grey-400);
-    
-    
-    /* UI fonts: Family, size and color (dark to bright)
-        ---------------------------------------------------
-         The UI font CSS variables are used for the typography all of the Theia
-         user interface elements that are not directly user-generated content.
-      */
-
-    --theia-ui-font-scale-factor: 1.2;
-    --theia-ui-font-size0: calc(var(--theia-ui-font-size1) / var(--theia-ui-font-scale-factor));
-    --theia-ui-font-size1: 13px; /* Base font size */
-    --theia-ui-font-size2: calc(var(--theia-ui-font-size1) * var(--theia-ui-font-scale-factor));
-    --theia-ui-font-size3: calc(var(--theia-ui-font-size2) * var(--theia-ui-font-scale-factor));
-    --theia-ui-icon-font-size: 14px; /* Ensures px perfect FontAwesome icons */
-    --theia-ui-font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-
-    --theia-ui-font-color0: var(--md-grey-900);
-    --theia-ui-font-color1: var(--md-grey-700);
-    --theia-ui-font-color2: var(--md-grey-500);
-    --theia-ui-font-color3: var(--md-grey-300);
-    
-    /* Special font colors */
-    
-    --theia-ui-icon-font-color: #ffffff;
-    --theia-ui-bar-font-color0: var(--theia-ui-font-color0);
-    --theia-ui-bar-font-color1: var(--theia-inverse-ui-font-color0); /* var(--theia-ui-font-color1); */
-    
-    /* Use the inverse UI colors against the brand/accent/warn/error colors. */
-    
-    --theia-inverse-ui-font-color0: rgba(255, 255, 255, 1.0);
-    --theia-inverse-ui-font-color2: rgba(255, 255, 255, 0.7);
-    --theia-inverse-ui-font-color3: rgba(255, 255, 255, 0.5);
-    
-    /* Content fonts: Family, size and color (dark to bright)
-         Content font variables are used for typography of user-generated content.
-      */
-    
-    --theia-content-font-size: 13px;
-    --theia-content-line-height: 1.5;
-    --theia-content-font-color0: black;
-    --theia-content-font-color1: black;
-    --theia-content-font-color2: var(--md-grey-700);
-    --theia-content-font-color3: var(--md-grey-500);
-    --theia-code-font-size: 13px;
-    --theia-code-line-height: 17px;
-    --theia-code-padding: 5px;
-    --theia-code-font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Courier New", monospace, "Droid Sans Fallback";
-    --theia-terminal-font-family: monospace;
-    --theia-ui-padding: 6px;
-
-    /* Tab Icon Colors */
-    --theia-tab-icon-color: var(--theia-ui-font-color1);
-    --theia-tab-font-color: #000;
-    
-    /* Main layout colors (bright to dark)
-      ------------------------------------ */
-    
-    --theia-layout-color0: #ffffff;
-    --theia-layout-color1: #f7f9f9;
-    --theia-layout-color2: #ececec;
-    --theia-layout-color3: var(--theia-arduino-light2);
-    --theia-layout-color4: #dcdcdc;
-
-    /* Brand colors */
-    
-    --theia-brand-color0: var(--theia-arduino-light);
-    --theia-brand-color1: var(--theia-arduino-light1);
-    --theia-brand-color2: var(--theia-arduino-light2);
-    --theia-brand-color3: var(--theia-arduino-light3);
-    
-    /* Secondary Brand colors */
-    
-    --theia-secondary-brand-color0: var(--md-grey-700);
-    --theia-secondary-brand-color1: #b5c8c9;
-    --theia-secondary-brand-color2: var(--theia-arduino-light2);
-    --theia-secondary-brand-color3: var(--theia-arduino-light3);
-    
-    /* Accent colors (dark to bright): Use these to create contrast to layout colors. */
-    
-    --theia-accent-color0: var(--theia-arduino-light);
-    --theia-accent-color1: rgb(77, 183, 187, 1.0);
-    --theia-accent-color2: rgb(77, 183, 187, 0.8);
-    --theia-accent-color3: rgb(77, 183, 187, 0.6);
-    --theia-accent-color4: rgba(77, 183, 187, 0.4);
-    
-    /* Accent colors with opacity */
-    
-    --theia-transparent-accent-color0: hsla(210, 63%, 46%, 0.3);
-    --theia-transparent-accent-color1: hsla(207, 66%, 56%, 0.3);
-    --theia-transparent-accent-color2: hsla(207, 64%, 85%, 0.3);
-    --theia-transparent-accent-color3: hsla(205, 70%, 91%, 0.3);
-    
-    /* State colors (warn, error, success, info)
-        ------------------------------------------ */
-    --theia-warn-color0: var(--md-amber-500);
-    --theia-warn-color1: var(--md-amber-400);
-    --theia-warn-color2: var(--md-amber-300);
-    --theia-warn-color3: var(--md-amber-200);
-
-    --theia-warn-font-color0: var(--md-grey-900);
-    
-    --theia-error-color0: var(--md-red-400);
-    --theia-error-color1: #da5b4a;
-    --theia-error-color2: var(--md-red-200);
-    --theia-error-color3: var(--md-red-100);
-    
-    --theia-error-font-color0: var(--md-grey-300);
-    
-    --theia-success-color0: var(--md-green-500);
-    --theia-success-color1: var(--md-green-300);
-    --theia-success-color2: var(--md-green-100);
-    --theia-success-color3: var(--md-green-50);
-    
-    --theia-success-font-color0: var(--md-grey-300);
-    
-    --theia-info-color0: var(--md-cyan-700);
-    --theia-info-color1: var(--md-cyan-500);
-    --theia-info-color2: var(--md-cyan-300);
-    --theia-info-color3: var(--md-cyan-100);
-    
-    --theia-info-font-color0: var(--md-grey-300);
-    
-    --theia-disabled-color0: var(--md-grey-500);
-    --theia-disabled-color1: var(--md-grey-300);
-    --theia-disabled-color2: var(--md-grey-200);
-    --theia-disabled-color3: var(--md-grey-50);
-    
-    --theia-added-color0: rgba(0, 255, 0, 0.8);
-    --theia-removed-color0: rgba(230, 0, 0, 0.8);
-    --theia-modified-color0: rgba(0, 100, 150, 0.8);
-    
-    /* Background for selected text */
-    --theia-selected-text-background: var(--theia-accent-color3);
-    
-    /* Colors to highlight words in widgets like tree or editors */
-    
-    --theia-word-highlight-color0: rgba(168, 172, 148, 0.7);
-    --theia-word-highlight-color1: rgba(253, 255, 0, 0.2);
-    --theia-word-highlight-match-color0: rgba(234, 92, 0, 0.33);
-    --theia-word-highlight-match-color1: rgba(234, 92, 0, 0.5);
-    --theia-word-highlight-replace-color0: rgba(155, 185, 85, 0.2);
-    
-    /* Scroll-bars */
-    
-    --theia-scrollbar-width: 10px;
-    --theia-scrollbar-rail-width: 10px;
-    --theia-scrollbar-thumb-color: hsla(0, 0%, 61%, .4);
-    --theia-scrollbar-rail-color: transparent;
-    --theia-scrollbar-active-thumb-color: hsla(0, 0%, 39%, .4);
-    --theia-scrollbar-active-rail-color: transparent;
-    /* Menu */
-    --theia-menu-color0: var(--theia-arduino-light);
-    --theia-menu-color1: var(--theia-layout-color0);
-    --theia-menu-color2: #dae3e3;
-    /* Statusbar */
-    --theia-statusbar-color: var(--theia-arduino-light);
-    --theia-statusBar-font-color: var(--theia-inverse-ui-font-color0);
-    --theia-statusBar-font-size: 12px;
-    /* Buttons */
-    --theia-ui-button-color: var(--theia-accent-color1);
-    --theia-ui-button-color-hover: var(--theia-accent-color2);
-    --theia-ui-button-font-color: var(--theia-arduino-light);
-    --theia-ui-button-color-secondary: var(--theia-secondary-brand-color1);
-    --theia-ui-button-color-secondary-hover: var(--theia-menu-color2);
-    --theia-ui-button-font-color-secondary: var(--theia-inverse-ui-font-color0);
-    --theia-ui-button-color-disabled: var(--theia-accent-color3);
-    --theia-ui-button-font-color-disabled: var(--theia-ui-font-color2);
-    --theia-ui-button-color-secondary-disabled: var(--theia-disabled-color1);
-    --theia-ui-button-font-color-secondary-disabled: var(--theia-ui-font-color2);
-    /* Expand/collapse element */
-    --theia-ui-expand-button-color: var(--theia-accent-color4);
-    --theia-ui-expand-button-font-color: var(--theia-ui-font-color1);
-    /* Dialogs */
-    --theia-ui-dialog-header-color: var(--theia-arduino-light);
-    --theia-ui-dialog-header-font-color: var(--theia-inverse-ui-font-color0);
-    --theia-ui-dialog-color: rgb(236, 241, 241);
-    --theia-ui-dialog-font-color: black;
-    /* Variables */
-    --theia-variable-name-color: #9B46B0;
-    --theia-variable-value-color: rgba(108, 108, 108, 0.8);
-    --theia-number-variable-color: #09885A;
-    --theia-boolean-variable-color: #0000FF;
-    --theia-string-variable-color: #A31515;
-    /* ANSI color */
-    --theia-ansi-black-color: gray;
-    --theia-ansi-red-color: #BE1717;
-    --theia-ansi-green-color: #338A2F;
-    --theia-ansi-yellow-color: #BEB817;
-    --theia-ansi-blue-color: darkblue;
-    --theia-ansi-magenta-color: darkmagenta;
-    --theia-ansi-cyan-color: darkcyan;
-    --theia-ansi-white-color: #BDBDBD;
-    /* ANSI background color */
-    --theia-ansi-black-background-color: gray;
-    --theia-ansi-red-background-color: #BE1717;
-    --theia-ansi-green-background-color: #338A2F;
-    --theia-ansi-yellow-background-color: #BEB817;
-    --theia-ansi-blue-background-color: darkblue;
-    --theia-ansi-magenta-background-color: darkmagenta;
-    --theia-ansi-cyan-background-color: darkcyan;
-    --theia-ansi-white-background-color: #BDBDBD;
-
-    /* Output */
-    --theia-output-font-color: var(--theia-ui-font-color3);
-
-  }

arduino-ide-extension/src/browser/style/boards-config-dialog.css

@@ -15,7 +15,7 @@ div.dialogContent.select-board-dialog > div.head .title {
     font-weight: 400;
     letter-spacing: .02em;
     font-size: 1.2em;
-    color: #00979d;
+    color: var(--theia-arduino-branding-primary);
     margin: 17px 0;
 }
 
@@ -24,18 +24,18 @@ div#select-board-dialog .selectBoardContainer .head .text {
 }
 
 div#select-board-dialog .selectBoardContainer .body .list .item.selected {
-    background: var(--theia-ui-button-color-secondary-hover);
+    background: var(--theia-secondaryButton-hoverBackground);
 }
 
-div#select-board-dialog .selectBoardContainer .body .list .item.selected i{
-    color: var(--theia-arduino-light);
+div#select-board-dialog .selectBoardContainer .body .list .item.selected i {
+    color: var(--theia-arduino-branding-primary);
 }
 
 #select-board-dialog .selectBoardContainer .search,
 #select-board-dialog .selectBoardContainer .search input,
 #select-board-dialog .selectBoardContainer .list,
 #select-board-dialog .selectBoardContainer .list {
-    background: var(--theia-layout-color0);
+    background: var(--theia-editor-background);
 }
 
 #select-board-dialog .selectBoardContainer .body .search input {
@@ -47,7 +47,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{
     margin: 0;
     vertical-align: top;
     display: flex;
-    color: var(--theia-content-font-color0);
+    color: var(--theia-editor-foreground);
 }
 
 #select-board-dialog .selectBoardContainer .body .search input:focus {
@@ -79,7 +79,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{
 
 #select-board-dialog .selectBoardContainer .body .container .content .loading {
     font-size: var(--theia-ui-font-size1);
-    color: #7f8c8d;
+    color: var(--theia-arduino-branding-secondary);
     padding: 10px 5px 10px 10px;
     text-transform: uppercase;
     /* The max, min-height comes from `.body .list` 265px + 47px top padding - 2 * 10px top padding */
@@ -97,9 +97,9 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{
     margin-left: auto;
 }
 
-#select-board-dialog .selectBoardContainer .body .list .item .detail {
+#select-board-dialog .selectBoardContainer .body .list .item .details {
     font-size: var(--theia-ui-font-size1);
-    color: var(--theia-disabled-color0);
+    opacity: var(--theia-mod-disabled-opacity);
     width: 155px; /* used heuristics for the calculation */
     white-space: pre;
     overflow: hidden;
@@ -107,11 +107,11 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{
 }
 
 #select-board-dialog .selectBoardContainer .body .list .item.missing {
-    color: var(--theia-disabled-color0);
+    opacity: var(--theia-mod-disabled-opacity);
 }
 
 #select-board-dialog .selectBoardContainer .body .list .item:hover {
-    background: var(--theia-ui-button-color-secondary-hover);
+    background: var(--theia-secondaryButton-hoverBackground);
 }
 
 #select-board-dialog .selectBoardContainer .body .list {
@@ -135,21 +135,6 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i{
     width: 740px;
 }
 
-button.theia-button {
-    height: 31px;
-}
-
-button.theia-button.secondary {
-    background-color: #b5c8c9;
-    color: #000;
-    box-shadow: 0 4px #95a5a6;
-}
-
-button.theia-button.main {
-    color: #fff;
-    /* background-color: #00979c; */
-    box-shadow: 0 4px var(--theia-accent-color0);
-}
 
 .dialogControl {
     margin: 0 20px 30px 0;
@@ -172,6 +157,13 @@ button.theia-button.main {
     margin: 0 5px;
 }
 
+.arduino-boards-toolbar-item-container .arduino-boards-toolbar-item .inner-container .guessed {
+    width: 10px;
+    height: 10px;
+    color: var(--theia-warningBackground);
+    margin: 0 5px;
+}
+
 .arduino-boards-toolbar-item-container {
     display: flex;
     align-items: center;
@@ -192,17 +184,21 @@ button.theia-button.main {
 }
 
 .arduino-boards-toolbar-item {
-    background: var(--theia-layout-color1);
+    background: var(--theia-tab-unfocusedActiveBackground);
+    color: var(--theia-foreground);
     height: 22px;
     display: flex;
     width: 100%;
     overflow: hidden;
+    margin: 0px 3px 0px 3px;
+    border: 1px solid var(--theia-dropdown-border);
 }
 
 .arduino-boards-dropdown-list {
-    border: 3px solid var(--theia-border-color2);
-    margin: -3px;
+    border: 3px solid var(--theia-activityBar-background);
+    margin: -1px;
     z-index: 1;
+    border: 1px solid var(--theia-dropdown-border);
 }
 
 .arduino-boards-dropdown-item {
@@ -210,16 +206,17 @@ button.theia-button.main {
     display: flex;
     padding: 10px;
     cursor: pointer;
-    color: var(--theia-ui-font-color1);
-    background: var(--theia-layout-color1);
+    color: var(--theia-foreground);
+    background: var(--theia-tab-unfocusedActiveBackground);
+    border: 1px solid var(--theia-tab-unfocusedActiveBackground);
 }
 
 .arduino-boards-dropdown-item .fa-check {
-    color: var(--theia-accent-color1);
+    color: var(--theia-arduino-branding-primary);
     align-self: center;
 }
 
 .arduino-boards-dropdown-item.selected,
 .arduino-boards-dropdown-item:hover {
-    background: var(--theia-layout-color3);
+    border: 1px solid var(--theia-focusBorder);
 }

arduino-ide-extension/src/browser/style/browser-menu.css

@@ -11,5 +11,5 @@
 }
 
 .p-MenuBar-item.p-mod-active {
-    color: var(--theia-ui-bar-font-color0);
+    color: var(--theia-menubar-selectionForeground);
 }

arduino-ide-extension/src/browser/style/editor.css

@@ -1,13 +1,6 @@
-/* Do not show the `close` icon for editor, but show the dirty state if not in pro-mode. */
-body:not(.arduino-advanced-mode) .p-TabBar.theia-app-centers .p-TabBar-tab.p-mod-closable:hover > .p-TabBar-tabCloseIcon,
-body:not(.arduino-advanced-mode) .p-TabBar.theia-app-centers .p-TabBar-tab.p-mod-current > .p-TabBar-tabCloseIcon {
-    background-image: none;
-    cursor: pointer;
-}
-
-body:not(.arduino-advanced-mode) .p-TabBar.theia-app-centers .p-TabBar-tab.p-mod-closable.theia-mod-dirty:hover > .p-TabBar-tabCloseIcon,
-body:not(.arduino-advanced-mode) .p-TabBar.theia-app-centers .p-TabBar-tab.p-mod-closable.theia-mod-dirty > .p-TabBar-tabCloseIcon:hover {
-    background-size: 10px;
+/* Show the dirty indicator on unclosable widgets. On hover, it should still show the dot instead of the X. */
+/* https://github.com/arduino/arduino-pro-ide/issues/380 */
+.p-TabBar.theia-app-centers .p-TabBar-tab.p-mod-closable.theia-mod-dirty > .p-TabBar-tabCloseIcon:hover {
+    background-size: 13px;
     background-image: var(--theia-icon-circle);
-    cursor: pointer;
-}
+}

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

@@ -1,43 +1,68 @@
 @import './list-widget.css';
-@import './board-select-dialog.css';
+@import './boards-config-dialog.css';
 @import './main.css';
-@import './editor.css';
 @import './monitor.css';
 @import './arduino-select.css';
+@import './status-bar.css';
+@import './terminal.css';
+@import './editor.css';
+@import './settings-dialog.css';
 
-input:focus {
+.theia-input.warning:focus {
     outline-width: 1px;
     outline-style: solid;
     outline-offset: -1px;
     opacity: 1 !important;
-    outline-color: var(--theia-accent-color3);
+    color: var(--theia-warningForeground);
+    background-color: var(--theia-warningBackground);
 }
 
-input.warning:focus {
-    outline-width: 1px;
-    outline-style: solid;
-    outline-offset: -1px;
-    opacity: 1 !important;
-    color: var(--theia-warn-font-color0);
-    background-color: var(--theia-warn-color0);
+.theia-input.warning {
+    background-color: var(--theia-warningBackground);
 }
 
-input.warning {
-    background-color: var(--theia-warn-color0);
-}
-
-input.warning::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
-    color: var(--theia-warn-font-color0);
-    background-color: var(--theia-warn-color0);
+.theia-input.warning::placeholder { /* Chrome, Firefox, Opera, Safari 10.1+ */
+    color: var(--theia-warningForeground);
+    background-color: var(--theia-warningBackground);
     opacity: 1; /* Firefox */
 }
 
-input.warning:-ms-input-placeholder { /* Internet Explorer 10-11 */
-    color: var(--theia-warn-font-color0);
-    background-color: var(--theia-warn-color0);
+.theia-input.warning:-ms-input-placeholder { /* Internet Explorer 10-11 */
+    color: var(--theia-warningForeground);
+    background-color: var(--theia-warningBackground);
 }
 
-input.warning::-ms-input-placeholder { /* Microsoft Edge */
-    color: var(--theia-warn-font-color0);
-    background-color: var(--theia-warn-color0);
+.theia-input.warning::-ms-input-placeholder { /* Microsoft Edge */
+    color: var(--theia-warningForeground);
+    background-color: var(--theia-warningBackground);
+}
+
+/* Makes the sidepanel a bit wider when opening the widget */ 
+.p-DockPanel-widget {
+    min-width: 200px;
+    min-height: 200px;
+}
+
+/* Overrule the default Theia CSS button styles. */
+button.theia-button,
+.theia-button {
+    border: 1px solid var(--theia-dropdown-border);
+}
+
+button.theia-button:hover,
+.theia-button:hover {
+    border: 1px solid var(--theia-focusBorder);
+}
+
+button.theia-button {
+    height: 31px;
+}
+
+button.theia-button.secondary {
+    background-color: var(--theia-secondaryButton-background);
+    color: var(--theia-foreground);
+}
+
+button.theia-button.main {
+    color: var(--theia-button-foreground);
 }

arduino-ide-extension/src/browser/style/list-widget.css

@@ -4,36 +4,15 @@
 }
 
 .arduino-list-widget {
-    color: var(--theia-ui-font-color1);
+    color: var(--theia-foreground);
 }
 
 .arduino-list-widget .search-bar {
     margin: 0px 10px 10px 15px;
 }
 
-.arduino-list-widget .search-filters {
-    margin: 0px 10px 0px 15px;
-    border-color: var(--theia-border-color3);
-}
-
 .arduino-list-widget .search-bar:focus {
-    border-color: var(--theia-accent-color3);
-}
-
-.arduino-list-widget .filterable-list-container .search-filters .filter {
-    margin: 0px 0px 10px 0px;
-    display: flex;
-}
-
-.arduino-list-widget .filterable-list-container .search-filters .filter .title {
-    margin: 0px 10px 0px 0px;
-    align-self: center;
-    text-transform: uppercase;
-    font-size: var(--theia-ui-font-size0);
-}
-
-.arduino-list-widget .filterable-list-container .search-filters .filter > select {
-    width: 100%;
+    border-color: var(--theia-focusBorder);
 }
 
 .filterable-list-container {
@@ -49,22 +28,25 @@
 }
 
 .filterable-list-container .items-container > div:nth-child(odd) {
-    background-color: var(--theia-layout-color0);
+    background-color: var(--theia-sideBar-background);
+    filter: contrast(105%);
 }
 
 .filterable-list-container .items-container > div:nth-child(even) {
-    background-color: var(--theia-layout-color1);
+    background-color: var(--theia-sideBar-background);
+    filter: contrast(95%);
 }
 
 .filterable-list-container .items-container > div:hover {
-    background-color: var(--theia-layout-color2);
+    background-color: var(--theia-sideBar-background);
+    filter: contrast(90%);
 }
 
 /* Perfect scrollbar does not like if we explicitly set the `background-color` of the contained elements.
 See above: `.filterable-list-container .items-container > div:nth-child(odd|event)`.
 We have to increase `z-index` of the scroll-bar thumb. Otherwise, the thumb is not visible.
 https://github.com/arduino/arduino-pro-ide/issues/82 */
-.arduino-list-widget .ps__rail-y > .ps__thumb-y {
+.arduino-list-widget .filterable-list-container .items-container .ps__rail-y {
     z-index: 1;
 }
 
@@ -74,18 +56,9 @@ https://github.com/arduino/arduino-pro-ide/issues/82 */
 }
 
 .component-list-item:hover {
-    background: var(--theia-accent-color4);
     cursor: pointer;
 }
 
-.component-list-item:hover .meta-info {
-    color: var(--theia-ui-font-color1);
-}
-
-.component-list-item .meta-info {
-    color: var(--theia-ui-font-color3);
-}
-
 .component-list-item .header {
     padding-bottom: 2px;
     display: flex;
@@ -104,33 +77,37 @@ https://github.com/arduino/arduino-pro-ide/issues/82 */
 
 .component-list-item .header .author {
     font-weight: bold;
-    color: var(--theia-ui-font-color2);
+    color: var(--theia-panelTitle-inactiveForeground);
 }
 
 .component-list-item:hover .header .author {
-    color: var(--theia-ui-font-color1);
+    color: var(--theia-foreground);
 }
 
 .component-list-item .header .version {
-    color: var(--theia-ui-font-color2);
+    color: var(--theia-panelTitle-inactiveForeground);
+}
+
+.component-list-item .footer .theia-button.install {
+    height: auto; /* resets the default Theia button height in the filterable list widget */
 }
 
 .component-list-item .header .installed:before {
     margin-left: 4px;
     display: inline-block;
     justify-self: end;
-    background-color: var(--theia-accent-color1);
+    background-color: var(--theia-button-background);
     padding: 2px 4px 2px 4px;
     font-size: 10px;
     font-weight: bold;
     max-height: calc(1em + 4px);
-    color: var(--theia-inverse-ui-font-color0);
+    color: var(--theia-button-foreground);
     content: 'INSTALLED';
 }
 
 .component-list-item .header .installed:hover:before {
-    background-color: var(--theia-inverse-ui-font-color0);
-    color: var(--theia-accent-color1);
+    background-color: var(--theia-button-foreground);
+    color: var(--theia-button-background);
     content: 'UNINSTALL';
 }
 
@@ -161,14 +138,10 @@ https://github.com/arduino/arduino-pro-ide/issues/82 */
 }
 
 .component-list-item .info a {
-    color: var(--theia-brand-color1);
+    color: var(--theia-button-background);
     text-decoration: none;
 }
 
 .component-list-item a:hover {
     text-decoration: underline;
 }
-
-.component-list-item strong.installed {
-    color: rgb(0, 151, 157)
-}