Fixed Save As when overwriting existing sketch.

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

.github/workflows/build.yml

@@ -6,6 +6,7 @@ on:
       - master
     tags:
       - '[0-9]+.[0-9]+.[0-9]+*'
+  workflow_dispatch:
   pull_request:
     branches:
       - master
@@ -18,23 +19,21 @@ jobs:
     strategy:
       matrix:
         config:
-          - os: windows-2016
+          - os: windows-latest
           - os: ubuntu-latest
           - os: macos-latest
           # - os: rsora-rpi-arm # self-hosted armhf
     runs-on: ${{ matrix.config.os }}
     timeout-minutes: 90
-    env:
-      CERTIFICATE_PATH: /tmp/macos_signing_certificate.p12
 
     steps:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Install Node.js 10.x
+      - name: Install Node.js 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: '10.x'
+          node-version: '12.14.1'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install Python 2.7
@@ -42,13 +41,6 @@ jobs:
         with:
           python-version: '2.7'
 
-      - name: Generate signing certificate file [macOS]
-        if: runner.OS == 'macOS'
-        run: |
-            # 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 > "${{ env.CERTIFICATE_PATH }}"
-
       - name: Package
         shell: bash
         env:
@@ -58,15 +50,25 @@ jobs:
           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' }}
+          IS_NIGHTLY: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master') }}
           IS_RELEASE: ${{ startsWith(github.ref, 'refs/tags/') }}
         run: |
-            # electron-builder will try to sign during the Windows job if these environment variables are defined
+            # See: https://www.electron.build/code-signing
             if [ "${{ runner.OS }}" = "macOS" ]; then
-              # See: https://www.electron.build/code-signing
-              export CSC_LINK="${{ env.CERTIFICATE_PATH }}"
+              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
+
             yarn --cwd ./electron/packager/
             yarn --cwd ./electron/packager/ package
 
@@ -76,9 +78,51 @@ jobs:
           name: build-artifacts
           path: electron/build/dist/build-artifacts/
 
-  publish:
+  changelog:
     needs: build
-    if: github.event_name == 'schedule'
+    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-pro-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/master')
+        uses: actions/upload-artifact@v2
+        with:
+          name: build-artifacts
+          path: CHANGELOG.txt
+
+  publish:
+    needs: changelog
+    if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master')
     runs-on: ubuntu-latest
     steps:
       - name: Download [GitHub Actions]
@@ -88,16 +132,17 @@ jobs:
           path: build-artifacts
 
       - name: Publish Nightly [S3]
-        uses: kittaakos/upload-s3-action@v0.0.1
-        with:
-          aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws_bucket: ${{ secrets.DOWNLOADS_BUCKET }}
-          source_dir: build-artifacts/
-          destination_dir: arduino-pro-ide/nightly/
+        uses: docker://plugins/s3
+        env:
+          PLUGIN_SOURCE: "build-artifacts/*"
+          PLUGIN_STRIP_PREFIX: "build-artifacts/"
+          PLUGIN_TARGET: "/arduino-pro-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: build
+    needs: changelog
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
@@ -107,27 +152,28 @@ jobs:
           name: build-artifacts
           path: build-artifacts
 
-      - name: Create Release [GitHub]
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
+      - 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@v1-release
+        uses: svenstaro/upload-release-action@2.2.0
         with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          repo_token: ${{ secrets.RELEASE_TOKEN }}
+          repo_name: arduino/arduino-pro-ide
+          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: kittaakos/upload-s3-action@v0.0.1
-        with:
-          aws_key_id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws_bucket: ${{ secrets.DOWNLOADS_BUCKET }}
-          source_dir: build-artifacts/
-          destination_dir: arduino-pro-ide/
+        uses: docker://plugins/s3
+        env:
+          PLUGIN_SOURCE: "build-artifacts/*"
+          PLUGIN_STRIP_PREFIX: "build-artifacts/"
+          PLUGIN_TARGET: "/arduino-pro-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,122 @@
+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:
+    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

@@ -4,6 +4,7 @@ node_modules/
 lib/
 downloads/
 build/
+Examples/
 !electron/build/
 src-gen/
 *webpack.config.js

.vscode/tasks.json

@@ -3,6 +3,17 @@
   // for the documentation about the tasks.json format
   "version": "2.0.0",
   "tasks": [
+    {
+      "label": "Arduino Pro IDE - Rebuild Electron App",
+      "type": "shell",
+      "command": "yarn rebuild:browser && yarn rebuild:electron",
+      "group": "build",
+      "presentation": {
+        "reveal": "always",
+        "panel": "new",
+        "clear": false
+      }
+    },
     {
       "label": "Arduino Pro IDE - Start Browser App",
       "type": "shell",
@@ -24,18 +35,7 @@
         "panel": "new",
         "clear": false
       }
-    },
-    {
-      "label": "Arduino Pro IDE - Watch Debugger Extension",
-      "type": "shell",
-      "command": "yarn --cwd ./arduino-debugger-extension watch",
-      "group": "build",
-      "presentation": {
-        "reveal": "always",
-        "panel": "new",
-        "clear": false
-      }
-    },
+    }
     {
       "label": "Arduino Pro IDE - Watch Browser App",
       "type": "shell",
@@ -63,7 +63,6 @@
       "type": "shell",
       "dependsOn": [
         "Arduino Pro IDE - Watch IDE Extension",
-        "Arduino Pro IDE - Watch Debugger Extension",
         "Arduino Pro IDE - Watch Browser App"
       ]
     },
@@ -72,7 +71,6 @@
       "type": "shell",
       "dependsOn": [
         "Arduino Pro IDE - Watch IDE Extension",
-        "Arduino Pro IDE - Watch Debugger Extension",
         "Arduino Pro IDE - Watch Electron App"
       ]
     }

README.md

@@ -8,16 +8,18 @@ You can download the latest version of the Arduino Pro IDE application for the s
 
 #### Latest version
 
-Platform  | 32 bit                   | 64 bit                   |
---------- | ------------------------ | ------------------------ |
-Linux     |                          | [Linux 64 bit]           |
-Linux ARM | [🚧 Work in progress...] | [🚧 Work in progress...] |
-Windows   |                          | [Windows 64 bit]         |
-macOS     |                          | [macOS 64 bit]           |
+Platform  | 32 bit                   | 64 bit                                                                         |
+--------- | ------------------------ | ------------------------------------------------------------------------------ |
+Linux     |                          | [Linux 64 bit]                                                                 |
+Linux ARM | [🚧 Work in progress...] | [🚧 Work in progress...]                                                      |
+Windows   |                          | [Windows 64 bit installer]<br />[Windows 64 bit MSI]<br />[Windows 64 bit ZIP] |
+macOS     |                          | [macOS 64 bit]                                                                 |
 
 [🚧 Work in progress...]: https://github.com/arduino/arduino-pro-ide/issues/287
 [Linux 64 bit]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_Linux_64bit.zip
-[Windows 64 bit]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_Windows_64bit.zip
+[Windows 64 bit installer]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_Windows_64bit.exe
+[Windows 64 bit MSI]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_Windows_64bit.msi
+[Windows 64 bit ZIP]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_Windows_64bit.zip
 [macOS 64 bit]: https://downloads.arduino.cc/arduino-pro-ide/arduino-pro-ide_latest_macOS_64bit.dmg
 
 #### Previous versions
@@ -30,16 +32,18 @@ These builds are generated every day at 03:00 GMT from the `master` branch and
 should be considered unstable. In order to get the latest nightly build
 available for the supported platform, use the following links:
 
-Platform  | 32 bit                   | 64 bit                   |
---------- | ------------------------ | ------------------------ |
-Linux     |                          | [Nightly Linux 64 bit]   |
-Linux ARM | [🚧 Work in progress...] | [🚧 Work in progress...] |
-Windows   |                          | [Nightly Windows 64 bit] |
-macOS     |                          | [Nightly macOS 64 bit]   |
+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]                                                                                 |
 
 [🚧 Work in progress...]: https://github.com/arduino/arduino-pro-ide/issues/287
 [Nightly Linux 64 bit]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_Linux_64bit.zip
-[Nightly Windows 64 bit]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_Windows_64bit.zip
+[Nightly Windows 64 bit installer]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_Windows_64bit.exe
+[Nightly Windows 64 bit MSI]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_Windows_64bit.msi
+[Nightly Windows 64 bit ZIP]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_Windows_64bit.zip
 [Nightly macOS 64 bit]: https://downloads.arduino.cc/arduino-pro-ide/nightly/arduino-pro-ide_nightly-latest_macOS_64bit.dmg
 
 > These links return an HTTP `302: Found` response, redirecting to latest

arduino-debugger-extension/package.json

@@ -1,11 +1,11 @@
 {
   "name": "arduino-debugger-extension",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "An extension for debugging Arduino programs",
   "license": "MIT",
   "dependencies": {
     "@theia/debug": "next",
-    "arduino-ide-extension": "0.1.1",
+    "arduino-ide-extension": "0.1.3",
     "cdt-gdb-adapter": "^0.0.14",
     "vscode-debugadapter": "^1.26.0",
     "vscode-debugprotocol": "^1.26.0"

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

@@ -1,5 +1,5 @@
 import { injectable, inject } from 'inversify';
-import { MenuModelRegistry, Path, MessageService, Command, CommandRegistry } from '@theia/core';
+import { MenuModelRegistry, MessageService, Command, CommandRegistry } from '@theia/core';
 import { KeybindingRegistry } from '@theia/core/lib/browser';
 import { TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { DebugFrontendApplicationContribution, DebugCommands } from '@theia/debug/lib/browser/debug-frontend-application-contribution';
@@ -62,8 +62,8 @@ export class ArduinoDebugFrontendApplicationContribution extends DebugFrontendAp
             if (current.configuration.type === 'arduino') {
                 const wsStat = this.workspaceService.workspace;
                 let sketchFileURI: URI | undefined;
-                if (wsStat && await this.sketchesService.isSketchFolder(wsStat.uri)) {
-                    const wsPath = new Path(wsStat.uri);
+                if (wsStat && await this.sketchesService.isSketchFolder(wsStat.resource.toString())) {
+                    const wsPath = wsStat.resource.path;
                     const sketchFilePath = wsPath.join(wsPath.name + '.ino').toString();
                     sketchFileURI = new URI(sketchFilePath);
                 } else if (this.editorManager.currentEditor) {

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

@@ -2,13 +2,13 @@
 import { VariableContribution, VariableRegistry, Variable } from '@theia/variable-resolver/lib/browser';
 import { injectable, inject } from 'inversify';
 import { MessageService } from '@theia/core/lib/common/message-service';
-import { BoardsServiceClientImpl } from 'arduino-ide-extension/lib/browser/boards/boards-service-client-impl';
+import { BoardsServiceProvider } from 'arduino-ide-extension/lib/browser/boards/boards-service-provider';
 
 @injectable()
 export class ArduinoVariableResolver implements VariableContribution {
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceProvider: BoardsServiceProvider;
 
     @inject(MessageService)
     protected readonly messageService: MessageService
@@ -27,7 +27,7 @@ export class ArduinoVariableResolver implements VariableContribution {
     }
 
     protected async resolveFqbn(): Promise<string | undefined> {
-        const { boardsConfig } = this.boardsServiceClient;
+        const { boardsConfig } = this.boardsServiceProvider;
         if (!boardsConfig || !boardsConfig.selectedBoard) {
             this.messageService.error('No board selected. Please select a board for debugging.');
             return undefined;
@@ -36,7 +36,7 @@ export class ArduinoVariableResolver implements VariableContribution {
     }
 
     protected async resolvePort(): Promise<string | undefined> {
-        const { boardsConfig } = this.boardsServiceClient;
+        const { boardsConfig } = this.boardsServiceProvider;
         if (!boardsConfig || !boardsConfig.selectedPort) {
             return undefined;
         }

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

@@ -30,6 +30,7 @@ export class ArduinoGDBBackend extends GDBBackend {
             '--interpreter', 'mi2',
             sketchDir
         ];
+        console.log('Starting debugger:', command, JSON.stringify(args));
         const proc = spawn(command, args);
         this.proc = proc;
         this.out = proc.stdin;

arduino-ide-extension/README.md

@@ -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/data/cli/schema/arduino-cli.schema.json

@@ -92,6 +92,17 @@
       },
       "additionalProperties": false
     },
+    "sketch": {
+      "type": "object",
+      "description": "Sketch Configuration",
+      "properties": {
+        "always_export_binaries": {
+          "type": "boolean",
+          "description": "Controls whether the compiled binaries will be exported into the sketch's 'build' folder or not. 'false' if the binaries are not exported."
+        }
+      },
+      "additionalProperties": false
+    },
     "telemetry": {
       "type": "object",
       "description": "Telemetry Configuration",
@@ -108,10 +119,19 @@
         "additionalProperties": false
       },
       "additionalProperties": false
+    },
+    "library": {
+      "type": "object",
+      "description": "Library Configuration",
+      "properties": {
+        "enable_unsafe_install": {
+          "type": "boolean",
+          "description": "Set to 'true' to enable the use of the '--git-url' and '--zip-file' flags with 'arduino-cli lib install' These are considered 'unsafe' installation methods because they allow installing files that have not passed through the Library Manager submission process."
+        },
+        "additionalProperties": false
+      },
+      "additionalProperties": false
     }
   },
-  "// TODOs": [
-    "additionalProperties should be true. See the new telemetry entry"
-  ],
   "additionalProperties": false
 }

arduino-ide-extension/package.json

@@ -1,13 +1,14 @@
 {
   "name": "arduino-ide-extension",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "An extension for Theia building the Arduino IDE",
   "license": "MIT",
   "scripts": {
-    "prepare": "yarn download-cli && yarn download-ls && yarn run clean && yarn run build",
+    "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",
@@ -22,7 +23,6 @@
     "@theia/editor": "next",
     "@theia/filesystem": "next",
     "@theia/git": "next",
-    "@theia/languages": "next",
     "@theia/markers": "next",
     "@theia/monaco": "next",
     "@theia/navigator": "next",
@@ -57,7 +57,7 @@
     "p-queue": "^5.0.0",
     "ps-tree": "^1.2.0",
     "react-select": "^3.0.4",
-    "semver": "^6.3.0",
+    "semver": "^7.3.2",
     "string-natural-compare": "^2.0.3",
     "temp": "^0.9.1",
     "tree-kill": "^1.2.1",
@@ -99,7 +99,8 @@
     "lib",
     "src",
     "build",
-    "data"
+    "data",
+    "examples"
   ],
   "theiaExtensions": [
     {
@@ -112,6 +113,14 @@
     },
     {
       "frontend": "lib/browser/boards/quick-open/boards-quick-open-module"
+    },
+    {
+      "electronMain": "lib/electron-main/arduino-electron-main-module"
     }
-  ]
+  ],
+  "arduino": {
+    "cli": {
+      "version": "0.14.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 
 
-(() => {
-
-    const DEFAULT_VERSION = '0.12.1'; // require('moment')().format('YYYYMMDD');
+(async () => {
 
+    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, or 'nightly-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${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 '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;
+    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${version.startsWith('nightly-') ? '/nightly' : ''}/arduino-cli_${version}_${suffix}`;
-    downloader.downloadUnzipFile(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/downloader.js

@@ -21,9 +21,9 @@ process.on('uncaughtException', error => {
  * @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
+ * @param force {boolean}     Whether to download even if the target file exists. `false` by default.
  */
-exports.downloadUnzipFile = async (url, targetFile, filePrefix, force) => {
+exports.downloadUnzipFile = async (url, targetFile, filePrefix, force = false) => {
     if (fs.existsSync(targetFile) && !force) {
         shell.echo(`Skipping download because file already exists: ${targetFile}`);
         return;

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

@@ -16,23 +16,74 @@
         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);
     }
+    shell.echo(`<<< Repository cloned.`);
 
     const { platform } = process;
     const build = path.join(__dirname, '..', 'build');
     const cli = path.join(build, `arduino-cli${platform === 'win32' ? '.exe' : ''}`);
-    const rawVersion = shell.exec(`${cli} version`).trim();
-    if (!rawVersion) {
+    const jsonVersion = shell.exec(`${cli} version --format json`).trim();
+    if (!jsonVersion) {
         shell.echo(`Could not retrieve the CLI version from ${cli}.`);
         shell.exit(1);
     }
-    const version = rawVersion.substring(rawVersion.lastIndexOf('Commit:') + 'Commit:'.length).trim();
+    const version = JSON.parse(jsonVersion).VersionString;
     if (version) {
+        shell.echo(`>>> Checking out version: ${version}...`);
         if (shell.exec(`git -C ${repository} checkout ${version} -b ${version}`).code !== 0) {
             shell.exit(1);
         }
+        shell.echo(`<<< Checked out version: ${commitish}.`);
+    } else if (commitish) {
+        shell.echo(`>>> Checking out commitish: ${commitish}...`);
+        if (shell.exec(`git -C ${repository} checkout ${commitish}`).code !== 0) {
+            shell.exit(1);
+        }
+        shell.echo(`<<< Checked out commitish: ${commitish}.`);
     }
 
     shell.echo('>>> Generating TS/JS API from:');

arduino-ide-extension/src/browser/arduino-daemon-client-impl.ts

@@ -1,53 +0,0 @@
-import { injectable, inject } from 'inversify';
-import { ILogger } from '@theia/core/lib/common/logger';
-import { Event, Emitter } from '@theia/core/lib/common/event';
-import { MessageService } from '@theia/core/lib/common/message-service';
-import { ArduinoDaemonClient } from '../common/protocol';
-
-@injectable()
-export class ArduinoDaemonClientImpl implements ArduinoDaemonClient {
-
-    @inject(ILogger)
-    protected readonly logger: ILogger;
-
-    @inject(MessageService)
-    protected readonly messageService: MessageService;
-
-    protected readonly onStartedEmitter = new Emitter<void>();
-    protected readonly onStoppedEmitter = new Emitter<void>();
-    protected _isRunning = false;
-
-    notifyStopped(): void {
-        if (this._isRunning) {
-            this._isRunning = false;
-            this.onStoppedEmitter.fire();
-            this.info('The CLI daemon process has stopped.');
-        }
-    }
-
-    notifyStarted(): void {
-        if (!this._isRunning) {
-            this._isRunning = true;
-            this.onStartedEmitter.fire();
-            this.info('The CLI daemon process has started.');
-        }
-    }
-
-    get onDaemonStarted(): Event<void> {
-        return this.onStartedEmitter.event;
-    }
-
-    get onDaemonStopped(): Event<void> {
-        return this.onStoppedEmitter.event;
-    }
-
-    get isRunning(): boolean {
-        return this._isRunning;
-    }
-
-    protected info(message: string): void {
-        this.messageService.info(message, { timeout: 3000 });
-        this.logger.info(message);
-    }
-
-}

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

@@ -1,4 +1,4 @@
-import { MAIN_MENU_BAR, MenuContribution, MenuModelRegistry, SelectionService } from '@theia/core';
+import { MAIN_MENU_BAR, MenuContribution, MenuModelRegistry, SelectionService, ILogger } from '@theia/core';
 import {
     ContextMenuRenderer,
     FrontendApplication, FrontendApplicationContribution,
@@ -13,7 +13,6 @@ 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 { FileSystem } from '@theia/filesystem/lib/common';
 import { ProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution';
 import { MonacoMenus } from '@theia/monaco/lib/browser/monaco-menu';
 import { FileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution';
@@ -25,7 +24,7 @@ import { TerminalMenus } from '@theia/terminal/lib/browser/terminal-frontend-con
 import { inject, injectable, postConstruct } from 'inversify';
 import * as React from 'react';
 import { MainMenuManager } from '../common/main-menu-manager';
-import { BoardsService, BoardsServiceClient, CoreService, Port, SketchesService, ToolOutputServiceClient } from '../common/protocol';
+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';
@@ -33,7 +32,7 @@ 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 { BoardsServiceClientImpl } from './boards/boards-service-client-impl';
+import { BoardsServiceProvider } from './boards/boards-service-provider';
 import { BoardsToolBarItem } from './boards/boards-toolbar-item';
 import { EditorMode } from './editor-mode';
 import { ArduinoMenus } from './menu/arduino-menus';
@@ -41,11 +40,21 @@ 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';
+
+const debounce = require('lodash.debounce');
+import { OutputService } from '../common/protocol/output-service';
+import { NotificationCenter } from './notification-center';
+import { Settings } from './contributions/settings';
 
 @injectable()
 export class ArduinoFrontendContribution implements FrontendApplicationContribution,
     TabBarToolbarContribution, CommandContribution, MenuContribution, ColorContribution {
 
+    @inject(ILogger)
+    protected logger: ILogger;
+
     @inject(MessageService)
     protected readonly messageService: MessageService;
 
@@ -55,15 +64,8 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
     @inject(CoreService)
     protected readonly coreService: CoreService;
 
-    @inject(ToolOutputServiceClient)
-    protected readonly toolOutputServiceClient: ToolOutputServiceClient;
-
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClientImpl: BoardsServiceClientImpl;
-
-    // Unused but do not remove it. It's required by DI, otherwise `init` method is not called.
-    @inject(BoardsServiceClient)
-    protected readonly boardsServiceClient: BoardsServiceClient;
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClientImpl: BoardsServiceProvider;
 
     @inject(SelectionService)
     protected readonly selectionService: SelectionService;
@@ -77,8 +79,8 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
     @inject(FileDialogService)
     protected readonly fileDialogService: FileDialogService;
 
-    @inject(FileSystem)
-    protected readonly fileSystem: FileSystem;
+    @inject(FileService)
+    protected readonly fileSystem: FileService;
 
     @inject(SketchesService)
     protected readonly sketchService: SketchesService;
@@ -140,6 +142,19 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
     @inject(FileSystemExt)
     protected readonly fileSystemExt: FileSystemExt;
 
+    @inject(HostedPluginSupport)
+    protected hostedPluginSupport: HostedPluginSupport;
+
+    @inject(ExecutableService)
+    protected executableService: ExecutableService;
+    @inject(OutputService)
+    protected readonly outputService: OutputService;
+
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
+
+    protected invalidConfigPopup: Promise<void | 'No' | 'Yes' | undefined> | undefined;
+
     @postConstruct()
     protected async init(): Promise<void> {
         if (!window.navigator.onLine) {
@@ -177,6 +192,50 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
                 viewContribution.initializeLayout(app);
             }
         }
+        this.boardsServiceClientImpl.onBoardsConfigChanged(async ({ selectedBoard }) => {
+            if (selectedBoard) {
+                const { name, fqbn } = selectedBoard;
+                if (fqbn) {
+                    await this.hostedPluginSupport.didStart;
+                    this.startLanguageServer(fqbn, name);
+                }
+            }
+        });
+        this.notificationCenter.onConfigChanged(({ config }) => {
+            if (config) {
+                this.invalidConfigPopup = undefined;
+            } else {
+                if (!this.invalidConfigPopup) {
+                    this.invalidConfigPopup = this.messageService.error(`Your CLI configuration is invalid. Do you want to correct it now?`, 'No', 'Yes')
+                        .then(answer => {
+                            if (answer === 'Yes') {
+                                this.commandRegistry.executeCommand(Settings.Commands.OPEN_CLI_CONFIG.id)
+                            }
+                            this.invalidConfigPopup = undefined;
+                        });
+                }
+            }
+        });
+    }
+
+    protected startLanguageServer = debounce((fqbn: string, name: string | undefined) => this.doStartLanguageServer(fqbn, name));
+    protected async doStartLanguageServer(fqbn: string, name: string | undefined): Promise<void> {
+        this.logger.info(`Starting language server: ${fqbn}`);
+        const { clangdUri, cliUri, lsUri } = await this.executableService.list();
+        const [clangdPath, cliPath, lsPath] = await Promise.all([
+            this.fileSystem.fsPath(new URI(clangdUri)),
+            this.fileSystem.fsPath(new URI(cliUri)),
+            this.fileSystem.fsPath(new URI(lsUri)),
+        ]);
+        this.commandRegistry.executeCommand('arduino.languageserver.start', {
+            lsPath,
+            cliPath,
+            clangdPath,
+            board: {
+                fqbn,
+                name: name ? `"${name}"` : undefined
+            }
+        });
     }
 
     registerToolbarItems(registry: TabBarToolbarRegistry): void {
@@ -208,13 +267,13 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
             isToggled: () => this.editorMode.compileForDebug
         });
         registry.registerCommand(ArduinoCommands.OPEN_SKETCH_FILES, {
-            execute: async (uri: string) => {
+            execute: async (uri: URI) => {
                 this.openSketchFiles(uri);
             }
         });
         registry.registerCommand(ArduinoCommands.OPEN_BOARDS_DIALOG, {
-            execute: async () => {
-                const boardsConfig = await this.boardsConfigDialog.open();
+            execute: async (query?: string | undefined) => {
+                const boardsConfig = await this.boardsConfigDialog.open(query);
                 if (boardsConfig) {
                     this.boardsServiceClientImpl.boardsConfig = boardsConfig;
                 }
@@ -256,9 +315,9 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
         });
     }
 
-    protected async openSketchFiles(uri: string): Promise<void> {
+    protected async openSketchFiles(uri: URI): Promise<void> {
         try {
-            const sketch = await this.sketchService.loadSketch(uri);
+            const sketch = await this.sketchService.loadSketch(uri.toString());
             const { mainFileUri, otherSketchFileUris, additionalFileUris } = sketch;
             for (const uri of [mainFileUri, ...otherSketchFileUris, ...additionalFileUris]) {
                 await this.ensureOpened(uri);

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

@@ -6,23 +6,16 @@ import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contrib
 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 { 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 { 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, CoreServiceClient } from '../common/protocol/core-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 { 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 { 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';
@@ -40,7 +33,9 @@ import {
     ApplicationShell as TheiaApplicationShell,
     ShellLayoutRestorer as TheiaShellLayoutRestorer,
     CommonFrontendContribution as TheiaCommonFrontendContribution,
-    KeybindingRegistry as TheiaKeybindingRegistry
+    KeybindingRegistry as TheiaKeybindingRegistry,
+    TabBarRendererFactory,
+    ContextMenuRenderer
 } from '@theia/core/lib/browser';
 import { MenuContribution } from '@theia/core/lib/common/menu';
 import { ApplicationShell } from './theia/core/application-shell';
@@ -54,7 +49,7 @@ import { SearchInWorkspaceFrontendContribution } from './theia/search-in-workspa
 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, ConfigServiceClient } from '../common/protocol/config-service';
+import { ConfigService, ConfigServicePath } from '../common/protocol/config-service';
 import { MonitorWidget } from './monitor/monitor-widget';
 import { MonitorViewContribution } from './monitor/monitor-view-contribution';
 import { MonitorConnection } from './monitor/monitor-connection';
@@ -64,24 +59,19 @@ 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 { AboutDialog as TheiaAboutDialog } from '@theia/core/lib/browser/about-dialog';
-import { AboutDialog } from './theia/core/about-dialog';
 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 { ArduinoDaemonClientImpl } from './arduino-daemon-client-impl';
-import { ArduinoDaemonClient, ArduinoDaemonPath, ArduinoDaemon } from '../common/protocol/arduino-daemon';
-import { EditorManager as TheiaEditorManager } from '@theia/editor/lib/browser';
+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 { ConfigServiceClientImpl } from './config-service-client-impl';
-import { CoreServiceClientImpl } from './core-service-client-impl';
 import { BoardsDataMenuUpdater } from './boards/boards-data-menu-updater';
 import { BoardsDataStore } from './boards/boards-data-store';
 import { ILogger } from '@theia/core';
@@ -117,11 +107,34 @@ import { EditorWidgetFactory as TheiaEditorWidgetFactory } from '@theia/editor/l
 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';
 
 const ElementQueries = require('css-element-queries/src/ElementQueries');
 
 MonacoThemingService.register({
-    id: 'arduinoTheme',
+    id: 'arduino-theme',
     label: 'Light (Arduino)',
     uiTheme: 'vs',
     json: require('../../src/browser/data/arduino.color-theme.json')
@@ -142,15 +155,12 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     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);
@@ -165,34 +175,13 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(SketchesServiceClientImpl).toSelf().inSingletonScope();
 
     // Config service
-    bind(ConfigService).toDynamicValue(context => {
-        const connection = context.container.get(WebSocketConnectionProvider);
-        const client = context.container.get(ConfigServiceClientImpl);
-        return connection.createProxy(ConfigServicePath, client);
-    }).inSingletonScope();
-    bind(ConfigServiceClientImpl).toSelf().inSingletonScope();
-    bind(ConfigServiceClient).toDynamicValue(context => {
-        const client = context.container.get(ConfigServiceClientImpl);
-        WebSocketConnectionProvider.createProxy(context.container, ConfigServicePath, client);
-        return client;
-    }).inSingletonScope();
+    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();
+    bind(BoardsService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, BoardsServicePath)).inSingletonScope();
     // Boards service client to receive and delegate notifications from the backend.
-    bind(BoardsServiceClientImpl).toSelf().inSingletonScope();
-    bind(FrontendApplicationContribution).toService(BoardsServiceClientImpl);
-    bind(BoardsServiceClient).toDynamicValue(async context => {
-        const client = context.container.get(BoardsServiceClientImpl);
-        const service = context.container.get<BoardsService>(BoardsService);
-        await client.init(service);
-        WebSocketConnectionProvider.createProxy(context.container, BoardsServicePath, client);
-        return client;
-    }).inSingletonScope();
+    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();
@@ -225,26 +214,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     })
 
     // Core service
-    bind(CoreService).toDynamicValue(context => {
-        const connection = context.container.get(WebSocketConnectionProvider);
-        const client = context.container.get(CoreServiceClientImpl);
-        return connection.createProxy(CoreServicePath, client);
-    }).inSingletonScope();
-    // Core service client to receive and delegate notifications when the index or the library index has been updated.
-    bind(CoreServiceClientImpl).toSelf().inSingletonScope();
-    bind(CoreServiceClient).toDynamicValue(context => {
-        const client = context.container.get(CoreServiceClientImpl);
-        WebSocketConnectionProvider.createProxy(context.container, CoreServicePath, client);
-        return client;
-    }).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();
+    bind(CoreService).toDynamicValue(context => WebSocketConnectionProvider.createProxy(context.container, CoreServicePath)).inSingletonScope();
 
     // Serial monitor
     bind(MonitorModel).toSelf().inSingletonScope();
@@ -303,6 +273,12 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     });
     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);
 
     // Show a disconnected status bar, when the daemon is not available
     bind(ApplicationConnectionStatusContribution).toSelf().inSingletonScope();
@@ -322,30 +298,21 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(ProblemManager).toSelf().inSingletonScope();
     rebind(TheiaProblemManager).toService(ProblemManager);
 
-    // About dialog to show the CLI version
-    bind(AboutDialog).toSelf().inSingletonScope();
-    rebind(TheiaAboutDialog).toService(AboutDialog);
-
     // 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);
 
-    // Arduino daemon client. Receives notifications from the backend if the CLI daemon process has been restarted.
-    bind(ArduinoDaemon).toDynamicValue(context => {
-        const connection = context.container.get(WebSocketConnectionProvider);
-        const client = context.container.get(ArduinoDaemonClientImpl);
-        return connection.createProxy(ArduinoDaemonPath, client);
-    }).inSingletonScope();
-    bind(ArduinoDaemonClientImpl).toSelf().inSingletonScope();
-    bind(ArduinoDaemonClient).toDynamicValue(context => {
-        const client = context.container.get(ArduinoDaemonClientImpl);
-        WebSocketConnectionProvider.createProxy(context.container, ArduinoDaemonPath, client);
-        return client;
-    }).inSingletonScope();
+    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, CloseSketch);
@@ -358,4 +325,40 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     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);
+
+    bind(OutputServiceImpl).toSelf().inSingletonScope().onActivation(({ container }, outputService) => {
+        WebSocketConnectionProvider.createProxy(container, OutputServicePath, outputService);
+        return outputService;
+    });
+    bind(OutputService).toService(OutputServiceImpl);
+
+    bind(NotificationCenter).toSelf().inSingletonScope();
+    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);
 });

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

@@ -1,8 +1,8 @@
 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 '../widgets/progress-dialog';
 import { BoardsConfig } from './boards-config';
@@ -20,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;
@@ -36,7 +36,7 @@ export class BoardsAutoInstaller implements FrontendApplicationContribution {
         if (selectedBoard) {
             this.boardsService.search({}).then(packages => {
                 const candidates = packages
-                    .filter(pkg => pkg.boards.some(board => Board.sameAs(board, selectedBoard)))
+                    .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,9 +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 { CoreServiceClientImpl } from '../core-service-client-impl';
-import { ArduinoDaemonClientImpl } from '../arduino-daemon-client-impl';
+import { BoardsServiceProvider } from './boards-service-provider';
+import { NotificationCenter } from '../notification-center';
 
 @injectable()
 export class BoardsConfigDialogWidget extends ReactWidget {
@@ -14,15 +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(CoreServiceClientImpl)
-    protected readonly coreServiceClient: CoreServiceClientImpl;
-
-    @inject(ArduinoDaemonClientImpl)
-    protected readonly daemonClient: ArduinoDaemonClientImpl;
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
 
+    protected readonly onFilterTextDidChangeEmitter = new Emitter<string>();
     protected readonly onBoardConfigChangedEmitter = new Emitter<BoardsConfig.Config>();
     readonly onBoardConfigChanged = this.onBoardConfigChangedEmitter.event;
 
@@ -31,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) => {
@@ -44,12 +49,11 @@ export class BoardsConfigDialogWidget extends ReactWidget {
     protected render(): React.ReactNode {
         return <div className='selectBoardContainer'>
             <BoardsConfig
-                boardsService={this.boardsService}
-                boardsServiceClient={this.boardsServiceClient}
-                coreServiceClient={this.coreServiceClient}
-                daemonClient={this.daemonClient}
+                boardsServiceProvider={this.boardsServiceClient}
+                notificationCenter={this.notificationCenter}
                 onConfigChange={this.fireConfigChanged}
-                onFocusNodeSet={this.setFocusNode} />
+                onFocusNodeSet={this.setFocusNode}
+                onFilteredTextDidChangeEvent={this.onFilterTextDidChangeEmitter.event} />
         </div>;
     }
 

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,9 +1,11 @@
 import * as React from 'react';
-import { DisposableCollection } from '@theia/core';
-import { BoardsService, Board, Port, AttachedBoardsChangeEvent } from '../../common/protocol/boards-service';
-import { BoardsServiceClientImpl } from './boards-service-client-impl';
-import { CoreServiceClientImpl } from '../core-service-client-impl';
-import { ArduinoDaemonClientImpl } from '../arduino-daemon-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 {
 
@@ -13,16 +15,15 @@ export namespace BoardsConfig {
     }
 
     export interface Props {
-        readonly boardsService: BoardsService;
-        readonly boardsServiceClient: BoardsServiceClientImpl;
-        readonly coreServiceClient: CoreServiceClientImpl;
-        readonly daemonClient: ArduinoDaemonClientImpl;
+        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;
@@ -70,7 +71,7 @@ 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: [],
@@ -82,18 +83,18 @@ export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConf
 
     componentDidMount() {
         this.updateBoards();
-        this.props.boardsService.getAvailablePorts().then(ports => this.updatePorts(ports));
-        const { boardsServiceClient, coreServiceClient, daemonClient } = this.props;
+        this.updatePorts(this.props.boardsServiceProvider.availableBoards.map(({ port }) => port).filter(notEmpty));
         this.toDispose.pushAll([
-            boardsServiceClient.onAttachedBoardsChanged(event => this.updatePorts(event.newState.ports, AttachedBoardsChangeEvent.diff(event).detached.ports)),
-            boardsServiceClient.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());
             }),
-            boardsServiceClient.onBoardsPackageInstalled(() => this.updateBoards(this.state.query)),
-            boardsServiceClient.onBoardsPackageUninstalled(() => this.updateBoards(this.state.query)),
-            coreServiceClient.onIndexUpdated(() => this.updateBoards(this.state.query)),
-            daemonClient.onDaemonStarted(() => this.updateBoards(this.state.query)),
-            daemonClient.onDaemonStopped(() => this.setState({ searchResults: [] }))
+            this.props.notificationCenter.onPlatformInstalled(() => this.updateBoards(this.state.query)),
+            this.props.notificationCenter.onPlatformUninstalled(() => this.updateBoards(this.state.query)),
+            this.props.notificationCenter.onIndexUpdated(() => this.updateBoards(this.state.query)),
+            this.props.notificationCenter.onDaemonStarted(() => this.updateBoards(this.state.query)),
+            this.props.notificationCenter.onDaemonStopped(() => this.setState({ searchResults: [] })),
+            this.props.onFilteredTextDidChangeEvent(query => this.setState({ query }, () => this.updateBoards(this.state.query)))
         ]);
     }
 
@@ -107,10 +108,9 @@ 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();
+            : eventOrQuery.target.value.toLowerCase();
         this.setState({ query });
         this.queryBoards({ query }).then(searchResults => this.setState({ searchResults }));
     }
@@ -126,15 +126,15 @@ export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConf
         });
     }
 
-    protected queryBoards = (options: { query?: string } = {}): Promise<Array<Board & { packageName: string }>> => {
-        return this.props.boardsServiceClient.searchBoards(options);
+    protected queryBoards = (options: { query?: string } = {}): Promise<Array<BoardWithPackage>> => {
+        return this.props.boardsServiceProvider.searchBoards(options);
     }
 
-    protected get availablePorts(): Promise<Port[]> {
-        return this.props.boardsService.getAvailablePorts();
+    protected get availablePorts(): MaybePromise<Port[]> {
+        return this.props.boardsServiceProvider.availableBoards.map(({ port }) => port).filter(notEmpty);
     }
 
-    protected queryPorts = async (availablePorts: Promise<Port[]> = this.availablePorts) => {
+    protected queryPorts = async (availablePorts: MaybePromise<Port[]> = this.availablePorts) => {
         const ports = await availablePorts;
         return { knownPorts: ports.sort(Port.compare) };
     }
@@ -147,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());
     }
 
@@ -177,7 +177,7 @@ export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConf
     }
 
     protected renderBoards(): React.ReactNode {
-        const { selectedBoard, searchResults } = this.state;
+        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>();
@@ -191,11 +191,18 @@ export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConf
 
         return <React.Fragment>
             <div className='search'>
-                <input type='search' className='theia-input' 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'>
-                {Array.from(distinctBoards.values()).map(board => <Item<Board & { packageName: string }>
+                {Array.from(distinctBoards.values()).map(board => <Item<BoardWithPackage>
                     key={`${board.name}-${board.packageName}`}
                     item={board}
                     label={board.name}

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

@@ -3,7 +3,7 @@ import { inject, injectable } from 'inversify';
 import { CommandRegistry } from '@theia/core/lib/common/command';
 import { MenuModelRegistry, MenuNode } from '@theia/core/lib/common/menu';
 import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
-import { BoardsServiceClientImpl } from './boards-service-client-impl';
+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';
@@ -25,8 +25,8 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
     @inject(BoardsDataStore)
     protected readonly boardsDataStore: BoardsDataStore;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClient: BoardsServiceProvider;
 
     protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
     protected readonly toDisposeOnBoardChange = new DisposableCollection();

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

@@ -5,8 +5,8 @@ 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 { BoardsServiceClientImpl } from './boards-service-client-impl';
 import { BoardsService, ConfigOption, Installable, BoardDetails, Programmer } from '../../common/protocol';
+import { NotificationCenter } from '../notification-center';
 
 @injectable()
 export class BoardsDataStore implements FrontendApplicationContribution {
@@ -18,8 +18,8 @@ export class BoardsDataStore implements FrontendApplicationContribution {
     @inject(BoardsService)
     protected readonly boardsService: BoardsService;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
 
     @inject(LocalStorageService)
     protected readonly storageService: LocalStorageService;
@@ -27,13 +27,13 @@ export class BoardsDataStore implements FrontendApplicationContribution {
     protected readonly onChangedEmitter = new Emitter<void>();
 
     onStart(): void {
-        this.boardsServiceClient.onBoardsPackageInstalled(async ({ pkg }) => {
-            const { installedVersion: version } = pkg;
+        this.notificationCenter.onPlatformInstalled(async ({ item }) => {
+            const { installedVersion: version } = item;
             if (!version) {
                 return;
             }
             let shouldFireChanged = false;
-            for (const fqbn of pkg.boards.map(({ fqbn }) => fqbn).filter(notEmpty).filter(fqbn => !!fqbn)) {
+            for (const fqbn of item.boards.map(({ fqbn }) => fqbn).filter(notEmpty).filter(fqbn => !!fqbn)) {
                 const key = this.getStorageKey(fqbn, version);
                 let data = await this.storageService.getData<ConfigOption[] | undefined>(key);
                 if (!data || !data.length) {
@@ -58,27 +58,33 @@ export class BoardsDataStore implements FrontendApplicationContribution {
     }
 
     async appendConfigToFqbn(
-        fqbn: string,
-        boardsPackageVersion: MaybePromise<Installable.Version | undefined> = this.getBoardsPackageVersion(fqbn)): Promise<string> {
+        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,
+        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 (data) {
-            if (data.programmers !== undefined) { // to be backward compatible. We did not save the `programmers` into the `localStorage`.
-                return data;
-            }
+        if (BoardsDataStore.Data.is(data)) {
+            return data;
         }
 
         const boardDetails = await this.getBoardDetailsSafe(fqbn);
@@ -172,7 +178,7 @@ export class BoardsDataStore implements FrontendApplicationContribution {
         this.onChangedEmitter.fire();
     }
 
-    protected async getBoardsPackageVersion(fqbn: string): Promise<Installable.Version | undefined> {
+    protected async getBoardsPackageVersion(fqbn: string | undefined): Promise<Installable.Version | undefined> {
         if (!fqbn) {
             return undefined;
         }
@@ -196,5 +202,10 @@ export namespace BoardsDataStore {
             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,4 +1,4 @@
-import { inject, injectable } from 'inversify';
+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';
@@ -24,4 +24,13 @@ export class BoardsListWidget extends ListWidget<BoardsPackage> {
         });
     }
 
+    @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-provider.ts

@@ -1,36 +1,51 @@
-import { injectable, inject, optional } from 'inversify';
+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 { BoardsServiceClient, AttachedBoardsChangeEvent, BoardInstalledEvent, Board, Port, BoardUninstalledEvent, BoardsService } from '../../common/protocol';
+import {
+    Port,
+    Board,
+    BoardsService,
+    BoardsPackage,
+    AttachedBoardsChangeEvent,
+    BoardWithPackage
+} from '../../common/protocol';
 import { BoardsConfig } from './boards-config';
 import { naturalCompare } from '../../common/utils';
 import { compareAnything } from '../theia/monaco/comparers';
+import { NotificationCenter } from '../notification-center';
+import { CommandService } from '@theia/core';
+import { ArduinoCommands } from '../arduino-commands';
 
 interface BoardMatch {
-    readonly board: Board & Readonly<{ packageName: string }>;
+    readonly board: BoardWithPackage;
     readonly matches: monaco.filters.IMatch[] | undefined;
 }
 
 @injectable()
-export class BoardsServiceClientImpl implements BoardsServiceClient, FrontendApplicationContribution {
+export class BoardsServiceProvider implements FrontendApplicationContribution {
 
     @inject(ILogger)
     protected logger: ILogger;
 
-    @optional()
     @inject(MessageService)
     protected messageService: MessageService;
 
     @inject(StorageService)
     protected storageService: StorageService;
 
-    protected readonly onBoardsPackageInstalledEmitter = new Emitter<BoardInstalledEvent>();
-    protected readonly onBoardsPackageUninstalledEmitter = new Emitter<BoardUninstalledEvent>();
-    protected readonly onAttachedBoardsChangedEmitter = new Emitter<AttachedBoardsChangeEvent>();
+    @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[]>();
 
@@ -46,14 +61,7 @@ export class BoardsServiceClientImpl implements BoardsServiceClient, FrontendApp
     protected _attachedBoards: Board[] = []; // This does not contain the `Unknown` boards. They're visible from the available ports only.
     protected _availablePorts: Port[] = [];
     protected _availableBoards: AvailableBoard[] = [];
-    protected boardsService: BoardsService;
 
-    /**
-     * Event when the state of the attached/detached boards has changed. For instance, the user have detached a physical board.
-     */
-    readonly onAttachedBoardsChanged = this.onAttachedBoardsChangedEmitter.event;
-    readonly onBoardsPackageInstalled = this.onBoardsPackageInstalledEmitter.event;
-    readonly onBoardsPackageUninstalled = this.onBoardsPackageUninstalledEmitter.event;
     /**
      * 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,
@@ -64,33 +72,85 @@ export class BoardsServiceClientImpl implements BoardsServiceClient, FrontendApp
     readonly onBoardsConfigChanged = this.onBoardsConfigChangedEmitter.event;
     readonly onAvailableBoardsChanged = this.onAvailableBoardsChangedEmitter.event;
 
-    async onStart(): Promise<void> {
-        return this.loadState();
-    }
+    onStart(): void {
+        this.notificationCenter.onAttachedBoardsChanged(this.notifyAttachedBoardsChanged.bind(this));
+        this.notificationCenter.onPlatformInstalled(this.notifyPlatformInstalled.bind(this));
+        this.notificationCenter.onPlatformUninstalled(this.notifyPlatformUninstalled.bind(this));
 
-    /**
-     * When the FE connects to the BE, the BE stets the known boards and ports.\
-     * This is a DI workaround for not being able to inject the service into the client.
-     */
-    async init(boardsService: BoardsService): Promise<void> {
-        this.boardsService = boardsService;
-        const [attachedBoards, availablePorts] = await Promise.all([
+        Promise.all([
             this.boardsService.getAttachedBoards(),
-            this.boardsService.getAvailablePorts()
-        ]);
-        this._attachedBoards = attachedBoards;
-        this._availablePorts = availablePorts;
-        this.reconcileAvailableBoards().then(() => this.tryReconnect());
+            this.boardsService.getAvailablePorts(),
+            this.loadState()
+        ]).then(([attachedBoards, availablePorts]) => {
+            this._attachedBoards = attachedBoards;
+            this._availablePorts = availablePorts;
+            this.reconcileAvailableBoards().then(() => this.tryReconnect());
+        });
     }
 
-    notifyAttachedBoardsChanged(event: AttachedBoardsChangeEvent): void {
-        this.logger.info('Attached boards and available ports changed: ', JSON.stringify(event));
+    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.onAttachedBoardsChangedEmitter.fire(event);
         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) {
+                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)) {
@@ -119,43 +179,6 @@ export class BoardsServiceClientImpl implements BoardsServiceClient, FrontendApp
         return false;
     }
 
-    notifyBoardInstalled(event: BoardInstalledEvent): void {
-        this.logger.info('Board installed: ', JSON.stringify(event));
-        this.onBoardsPackageInstalledEmitter.fire(event);
-        const { selectedBoard } = this.boardsConfig;
-        const { installedVersion, id } = event.pkg;
-        if (selectedBoard) {
-            const installedBoard = event.pkg.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
-                };
-            }
-        }
-    }
-
-    notifyBoardUninstalled(event: BoardUninstalledEvent): void {
-        this.logger.info('Board uninstalled: ', JSON.stringify(event));
-        this.onBoardsPackageUninstalledEmitter.fire(event);
-        const { selectedBoard } = this.boardsConfig;
-        if (selectedBoard && selectedBoard.fqbn) {
-            const uninstalledBoard = event.pkg.boards.find(({ name }) => name === selectedBoard.name);
-            if (uninstalledBoard && uninstalledBoard.fqbn === selectedBoard.fqbn) {
-                this.logger.info(`Board package ${event.pkg.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
-                };
-            }
-        }
-    }
-
     set boardsConfig(config: BoardsConfig.Config) {
         this.doSetBoardsConfig(config);
         this.saveState().finally(() => this.reconcileAvailableBoards().finally(() => this.onBoardsConfigChangedEmitter.fire(this._boardsConfig)));
@@ -169,15 +192,15 @@ export class BoardsServiceClientImpl implements BoardsServiceClient, FrontendApp
         }
     }
 
-    async searchBoards({ query, cores }: { query?: string, cores?: string[] }): Promise<Array<Board & { packageName: string }>> {
+    async searchBoards({ query, cores }: { query?: string, cores?: string[] }): Promise<Array<BoardWithPackage>> {
         const boards = await this.boardsService.allBoards({});
         const coresFilter = !!cores && cores.length
-            ? ((toFilter: { packageName: string }) => cores.some(core => core === toFilter.packageName))
+            ? ((toFilter: BoardWithPackage) => cores.some(core => core === toFilter.packageName || core === toFilter.packageId))
             : () => true;
         if (!query) {
             return boards.filter(coresFilter).sort(Board.compare);
         }
-        const toMatch = ((toFilter: Board & { packageName: string }) => (({ board: toFilter, matches: monaco.filters.matchesFuzzy(query, toFilter.name, true) })));
+        const toMatch = ((toFilter: BoardWithPackage) => (({ board: toFilter, matches: monaco.filters.matchesFuzzy(query, toFilter.name, true) })));
         const compareEntries = (left: BoardMatch, right: BoardMatch, lookFor: string) => {
             const leftMatches = left.matches || [];
             const rightMatches = right.matches || [];
@@ -219,7 +242,7 @@ export class BoardsServiceClientImpl implements BoardsServiceClient, FrontendApp
         }
 
         if (!config.selectedBoard) {
-            if (!options.silent && this.messageService) {
+            if (!options.silent) {
                 this.messageService.warn('No boards selected.', { timeout: 3000 });
             }
             return false;
@@ -241,14 +264,14 @@ export class BoardsServiceClientImpl implements BoardsServiceClient, FrontendApp
 
         const { name } = config.selectedBoard;
         if (!config.selectedPort) {
-            if (!options.silent && this.messageService) {
+            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) {
+            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;
@@ -261,6 +284,29 @@ export class BoardsServiceClientImpl implements BoardsServiceClient, FrontendApp
         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;

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

@@ -5,7 +5,7 @@ import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Port } from '../../common/protocol';
 import { BoardsConfig } from './boards-config';
 import { ArduinoCommands } from '../arduino-commands';
-import { BoardsServiceClientImpl, AvailableBoard } from './boards-service-client-impl';
+import { BoardsServiceProvider, AvailableBoard } from './boards-service-provider';
 
 export interface BoardsDropDownListCoords {
     readonly top: number;
@@ -181,7 +181,7 @@ export class BoardsToolBarItem extends React.Component<BoardsToolBarItem.Props,
 export namespace BoardsToolBarItem {
 
     export interface Props {
-        readonly boardsServiceClient: BoardsServiceClientImpl;
+        readonly boardsServiceClient: BoardsServiceProvider;
         readonly commands: CommandRegistry;
     }
 

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

@@ -16,9 +16,9 @@ import {
 } from '@theia/core/lib/browser/quick-open';
 import { naturalCompare } from '../../../common/utils';
 import { BoardsService, Port, Board, ConfigOption, ConfigValue } from '../../../common/protocol';
-import { CoreServiceClientImpl } from '../../core-service-client-impl';
 import { BoardsDataStore } from '../boards-data-store';
-import { BoardsServiceClientImpl, AvailableBoard } from '../boards-service-client-impl';
+import { BoardsServiceProvider, AvailableBoard } from '../boards-service-provider';
+import { NotificationCenter } from '../../notification-center';
 
 @injectable()
 export class BoardsQuickOpenService implements QuickOpenContribution, QuickOpenModel, QuickOpenHandler, CommandContribution, KeybindingContribution, Command {
@@ -38,14 +38,14 @@ export class BoardsQuickOpenService implements QuickOpenContribution, QuickOpenM
     @inject(BoardsService)
     protected readonly boardsService: BoardsService;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClient: BoardsServiceProvider;
 
     @inject(BoardsDataStore)
     protected readonly boardsDataStore: BoardsDataStore;
 
-    @inject(CoreServiceClientImpl)
-    protected coreServiceClient: CoreServiceClientImpl;
+    @inject(NotificationCenter)
+    protected notificationCenter: NotificationCenter;
 
     protected isOpen: boolean = false;
     protected currentQuery: string = '';
@@ -59,7 +59,7 @@ export class BoardsQuickOpenService implements QuickOpenContribution, QuickOpenM
     // `init` name is used by the `QuickOpenHandler`.
     @postConstruct()
     protected postConstruct(): void {
-        this.coreServiceClient.onIndexUpdated(() => this.update(this.availableBoards));
+        this.notificationCenter.onIndexUpdated(() => this.update(this.availableBoards));
         this.boardsServiceClient.onAvailableBoardsChanged(availableBoards => this.update(availableBoards));
         this.update(this.boardsServiceClient.availableBoards);
     }

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

@@ -1,52 +0,0 @@
-import { injectable, inject } from 'inversify';
-import { ILogger } from '@theia/core/lib/common/logger';
-import { Event, Emitter } from '@theia/core/lib/common/event';
-import { CommandService } from '@theia/core/lib/common/command';
-import { MessageService } from '@theia/core/lib/common/message-service';
-import { ConfigServiceClient, Config } from '../common/protocol';
-import { Settings } from './contributions/settings';
-
-@injectable()
-export class ConfigServiceClientImpl implements ConfigServiceClient {
-
-    @inject(CommandService)
-    protected readonly commandService: CommandService;
-
-    @inject(ILogger)
-    protected readonly logger: ILogger;
-
-    @inject(MessageService)
-    protected readonly messageService: MessageService;
-
-    protected readonly onConfigChangedEmitter = new Emitter<Config>();
-    protected invalidConfigPopup: Promise<void | 'No' | 'Yes' | undefined> | undefined;
-
-    notifyConfigChanged(config: Config): void {
-        this.invalidConfigPopup = undefined;
-        this.info(`The CLI configuration has been successfully reloaded.`);
-        this.onConfigChangedEmitter.fire(config);
-    }
-
-    notifyInvalidConfig(): void {
-        if (!this.invalidConfigPopup) {
-            this.invalidConfigPopup = this.messageService.error(`Your CLI configuration is invalid. Do you want to correct it now?`, 'No', 'Yes')
-                .then(answer => {
-                    if (answer === 'Yes') {
-                        this.commandService.executeCommand(Settings.Commands.OPEN_CLI_CONFIG.id)
-                    }
-                    this.invalidConfigPopup = undefined;
-                })
-
-        }
-    }
-
-    get onConfigChanged(): Event<Config> {
-        return this.onConfigChangedEmitter.event;
-    }
-
-    protected info(message: string): void {
-        this.messageService.info(message, { timeout: 3000 });
-        this.logger.info(message);
-    }
-
-}

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

@@ -0,0 +1,108 @@
+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 {
+        // On macOS we will get the `Quit ${YOUR_APP_NAME}` menu item natively, no need to duplicate it. 
+        registry.registerMenuAction(ArduinoMenus.HELP__ABOUT_GROUP, {
+            commandId: About.Commands.ABOUT_APP.id,
+            label: `About${isOSX ? ` ${this.applicationName}` : ''}`,
+            order: '0'
+        });
+    }
+
+    async showAbout(): Promise<void> {
+        const ideStatus = FrontendApplicationConfigProvider.get()['status'];
+        const { version, commit, status: cliStatus } = await this.configService.getVersion();
+        const buildDate = this.buildDate;
+        const detail = (useAgo: boolean) => `
+Version: ${remote.app.getVersion()}
+Date: ${buildDate ? buildDate : 'dev build'}${buildDate && useAgo ? ` (${this.ago(buildDate)})` : ''}
+CLI Version: ${version}${cliStatus ? ` ${cliStatus}` : ''} [${commit}]
+
+Copyright © ${new Date().getFullYear()} Arduino SA 
+`;
+        const ok = 'OK';
+        const copy = 'Copy';
+        const buttons = !isWindows && !isOSX ? [copy, ok] : [ok, copy];
+        const { response } = await remote.dialog.showMessageBox(remote.getCurrentWindow(), {
+            message: `${this.applicationName}${ideStatus ? ` – ${ideStatus}` : ''}`,
+            title: `${this.applicationName}${ideStatus ? ` – ${ideStatus}` : ''}`,
+            type: 'info',
+            detail: detail(true),
+            buttons,
+            noLink: true,
+            defaultId: buttons.indexOf(ok),
+            cancelId: buttons.indexOf(ok)
+        });
+
+        if (buttons[response] === copy) {
+            await this.clipboardService.writeText(detail(false));
+        }
+    }
+
+    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/burn-bootloader.ts

@@ -0,0 +1,78 @@
+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 }] = await Promise.all([
+                this.boardsDataStore.appendConfigToFqbn(boardsConfig.selectedBoard?.fqbn),
+                this.boardsDataStore.getData(boardsConfig.selectedBoard?.fqbn)
+            ]);
+            this.outputChannelManager.getChannel('Arduino: bootloader').clear();
+            await this.coreService.burnBootloader({
+                fqbn,
+                programmer,
+                port
+            });
+            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/contribution.ts

@@ -1,7 +1,8 @@
 import { inject, injectable, interfaces } from 'inversify';
 import URI from '@theia/core/lib/common/uri';
 import { ILogger } from '@theia/core/lib/common/logger';
-import { FileSystem } from '@theia/filesystem/lib/common';
+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 { MessageService } from '@theia/core/lib/common/message-service';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
@@ -13,11 +14,12 @@ import { Command, CommandRegistry, CommandContribution, CommandService } from '@
 import { EditorMode } from '../editor-mode';
 import { SketchesServiceClientImpl } from '../../common/protocol/sketches-service-client-impl';
 import { SketchesService, ConfigService, FileSystemExt, Sketch } from '../../common/protocol';
+import { FrontendApplicationContribution, FrontendApplication } from '@theia/core/lib/browser';
 
 export { Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, TabBarToolbarRegistry, URI, Sketch, open };
 
 @injectable()
-export abstract class Contribution implements CommandContribution, MenuContribution, KeybindingContribution, TabBarToolbarContribution {
+export abstract class Contribution implements CommandContribution, MenuContribution, KeybindingContribution, TabBarToolbarContribution, FrontendApplicationContribution {
 
     @inject(ILogger)
     protected readonly logger: ILogger;
@@ -37,6 +39,9 @@ export abstract class Contribution implements CommandContribution, MenuContribut
     @inject(LabelProvider)
     protected readonly labelProvider: LabelProvider;
 
+    onStart(app: FrontendApplication): MaybePromise<void> {
+    }
+
     registerCommands(registry: CommandRegistry): void {
     }
 
@@ -54,8 +59,8 @@ export abstract class Contribution implements CommandContribution, MenuContribut
 @injectable()
 export abstract class SketchContribution extends Contribution {
 
-    @inject(FileSystem)
-    protected readonly fileSystem: FileSystem;
+    @inject(FileService)
+    protected readonly fileService: FileService;
 
     @inject(FileSystemExt)
     protected readonly fileSystemExt: FileSystemExt;
@@ -75,11 +80,12 @@ export abstract class SketchContribution extends Contribution {
 }
 
 export namespace Contribution {
-    export function configure<T>(bind: interfaces.Bind, serviceIdentifier: interfaces.ServiceIdentifier<T>): void {
+    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,134 @@
+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 [cliPath, sketchPath] = await Promise.all([
+            this.fileService.fsPath(new URI(executables.cliUri)),
+            this.fileService.fsPath(new URI(sketch.uri))
+        ])
+        const config = {
+            cliPath,
+            board: {
+                fqbn,
+                name
+            },
+            sketchPath
+        };
+        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/examples.ts

@@ -0,0 +1,151 @@
+import * as PQueue from 'p-queue';
+import { inject, injectable, postConstruct } from 'inversify';
+import { MenuPath, SubMenuOptions, CompositeMenuNode } from '@theia/core/lib/common/menu';
+import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
+import { OpenSketch } from './open-sketch';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import { MainMenuManager } from '../../common/main-menu-manager';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import { ExamplesService, ExampleContainer } from '../../common/protocol/examples-service';
+import { SketchContribution, CommandRegistry, MenuModelRegistry } from './contribution';
+import { NotificationCenter } from '../notification-center';
+
+@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?.fqbn));
+    }
+
+    protected handleBoardChanged(fqbn: string | 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(
+        exampleContainer: ExampleContainer,
+        menuPath: MenuPath,
+        pushToDispose: DisposableCollection = new DisposableCollection(),
+        options?: SubMenuOptions): void {
+
+        const { label, sketches, children } = exampleContainer;
+        const submenuPath = [...menuPath, label];
+        this.menuRegistry.registerSubmenu(submenuPath, label, options);
+        children.forEach(child => this.registerRecursively(child, submenuPath, pushToDispose));
+        for (const sketch of sketches) {
+            const { uri } = sketch;
+            const commandId = `arduino-open-example-${submenuPath.join(':')}--${uri}`;
+            const command = { id: commandId };
+            const handler = {
+                execute: async () => {
+                    const sketch = await this.sketchService.cloneExample(uri);
+                    this.commandService.executeCommand(OpenSketch.Commands.OPEN_SKETCH.id, sketch);
+                }
+            };
+            pushToDispose.push(this.commandRegistry.registerCommand(command, handler));
+            this.menuRegistry.registerMenuAction(submenuPath, { commandId, label: sketch.name });
+            pushToDispose.push(Disposable.create(() => this.menuRegistry.unregisterMenuAction(command)));
+        }
+    }
+
+}
+
+@injectable()
+export class BuiltInExamples extends Examples {
+
+    onStart(): void {
+        this.register(); // no `await`
+    }
+
+    protected async register() {
+        let exampleContainers: ExampleContainer[] | undefined;
+        try {
+            exampleContainers = 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 exampleContainers) {
+            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(fqbn: string | undefined): void {
+        this.register(fqbn);
+    }
+
+    protected async register(fqbn: string | undefined = this.boardsServiceClient.boardsConfig.selectedBoard?.fqbn) {
+        return this.queue.add(async () => {
+            this.toDispose.dispose();
+            if (!fqbn) {
+                return;
+            }
+            const { user, current, any } = await this.examplesService.installed({ fqbn });
+            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/include-library.ts

@@ -0,0 +1,159 @@
+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 } from '../menu/arduino-menus';
+import { LibraryPackage, LibraryLocation, 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());
+    }
+
+    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 }));
+            }
+
+            // `Include Library` submenu
+            const includeLibMenuPath = [...ArduinoMenus.SKETCH__UTILS_GROUP, '0_include'];
+            this.menuRegistry.registerSubmenu(includeLibMenuPath, 'Include Library', { order: '1' });
+            // `Manage Libraries...` group.
+            this.menuRegistry.registerMenuAction([...includeLibMenuPath, '0_manage'], {
+                commandId: `${LibraryListWidget.WIDGET_ID}:toggle`,
+                label: 'Manage Libraries...'
+            });
+            this.toDispose.push(Disposable.create(() => this.menuRegistry.unregisterMenuAction({ commandId: `${LibraryListWidget.WIDGET_ID}:toggle` })));
+
+            // `Add .ZIP Library...`
+            // TODO: implement it
+
+            // `Arduino libraries`
+            const packageMenuPath = [...includeLibMenuPath, '2_arduino'];
+            const userMenuPath = [...includeLibMenuPath, '3_contributed'];
+            for (const library of libraries) {
+                this.toDispose.push(this.registerLibrary(library, library.location === LibraryLocation.USER ? userMenuPath : packageMenuPath));
+            }
+
+            this.mainMenuManager.update();
+        });
+    }
+
+    protected registerLibrary(library: LibraryPackage, menuPath: MenuPath): Disposable {
+        const commandId = `arduino-include-library--${library.name}:${library.author}`;
+        const command = { id: commandId };
+        const handler = { execute: () => this.commandRegistry.executeCommand(IncludeLibrary.Commands.INCLUDE_LIBRARY.id, library) };
+        const menuAction = { commandId, label: library.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/open-sketch-external.ts

@@ -1,5 +1,6 @@
 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';
 
@@ -30,9 +31,9 @@ export class OpenSketchExternal extends SketchContribution {
     protected async openExternal(): Promise<void> {
         const uri = await this.sketchServiceClient.currentSketchFile();
         if (uri) {
-            const exists = this.fileSystem.exists(uri);
+            const exists = this.fileService.exists(new URI(uri));
             if (exists) {
-                const fsPath = await this.fileSystem.getFsPath(uri);
+                const fsPath = await this.fileService.fsPath(new URI(uri));
                 if (fsPath) {
                     remote.shell.showItemInFolder(fsPath);
                 }

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

@@ -6,6 +6,8 @@ import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposa
 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';
 
 @injectable()
 export class OpenSketch extends SketchContribution {
@@ -16,6 +18,12 @@ export class OpenSketch extends SketchContribution {
     @inject(ContextMenuRenderer)
     protected readonly contextMenuRenderer: ContextMenuRenderer;
 
+    @inject(BuiltInExamples)
+    protected readonly builtInExamples: BuiltInExamples;
+
+    @inject(ExamplesService)
+    protected readonly examplesService: ExamplesService;
+
     protected readonly toDisposeBeforeCreateNewContextMenu = new DisposableCollection();
 
     registerCommands(registry: CommandRegistry): void {
@@ -53,6 +61,14 @@ export class OpenSketch extends SketchContribution {
                         });
                         this.toDisposeBeforeCreateNewContextMenu.push(Disposable.create(() => this.menuRegistry.unregisterMenuAction(command)));
                     }
+                    try {
+                        const containers = await this.examplesService.builtIns();
+                        for (const container of containers) {
+                            this.builtInExamples.registerRecursively(container, ArduinoMenus.OPEN_SKETCH__CONTEXT__EXAMPLES_GROUP, this.toDisposeBeforeCreateNewContextMenu);
+                        }
+                    } catch (e) {
+                        console.error('Error when collecting built-in examples.', e);
+                    }
                     const options = {
                         menuPath: ArduinoMenus.OPEN_SKETCH__CONTEXT,
                         anchor: {
@@ -99,7 +115,7 @@ export class OpenSketch extends SketchContribution {
 
     protected async selectSketch(): Promise<Sketch | undefined> {
         const config = await this.configService.getConfiguration();
-        const defaultPath = await this.fileSystem.getFsPath(config.sketchDirUri);
+        const defaultPath = await this.fileService.fsPath(new URI(config.sketchDirUri));
         const { filePaths } = await remote.dialog.showOpenDialog({
             defaultPath,
             properties: ['createDirectory', 'openFile'],
@@ -133,7 +149,7 @@ export class OpenSketch extends SketchContribution {
             });
             if (response === 1) { // OK
                 const newSketchUri = new URI(sketchFileUri).parent.resolve(name);
-                const exists = await this.fileSystem.exists(newSketchUri.toString());
+                const exists = await this.fileService.exists(newSketchUri);
                 if (exists) {
                     await remote.dialog.showMessageBox({
                         type: 'error',
@@ -142,8 +158,8 @@ export class OpenSketch extends SketchContribution {
                     });
                     return undefined;
                 }
-                await this.fileSystem.createFolder(newSketchUri.toString());
-                await this.fileSystem.move(sketchFileUri, newSketchUri.resolve(nameWithExt).toString());
+                await this.fileService.createFolder(newSketchUri);
+                await this.fileService.move(new URI(sketchFileUri), new URI(newSketchUri.resolve(nameWithExt).toString()));
                 return this.sketchService.getSketchFolder(newSketchUri.toString());
             }
         }

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

@@ -45,11 +45,11 @@ export class SaveAsSketch extends SketchContribution {
         // If target does not exist, propose a `directories.user`/${sketch.name} path
         // If target exists, propose `directories.user`/${sketch.name}_copy_${yyyymmddHHMMss}
         const sketchDirUri = new URI((await this.configService.getConfiguration()).sketchDirUri);
-        const exists = await this.fileSystem.exists(sketchDirUri.resolve(sketch.name).toString());
+        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.fileSystem.getFsPath(defaultUri.toString())!;
+        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;
@@ -61,7 +61,7 @@ export class SaveAsSketch extends SketchContribution {
         const workspaceUri = await this.sketchService.copy(sketch, { destinationUri });
         if (workspaceUri && openAfterMove) {
             if (wipeOriginal) {
-                await this.fileSystem.delete(sketch.uri);
+                await this.fileService.delete(new URI(sketch.uri));
             }
             this.workspaceService.open(new URI(workspaceUri), { preserveWindow: true });
         }

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

@@ -5,7 +5,7 @@ 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 { BoardsServiceClientImpl } from '../boards/boards-service-client-impl';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
 import { SketchContribution, Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, TabBarToolbarRegistry } from './contribution';
 
 @injectable()
@@ -20,8 +20,8 @@ export class UploadSketch extends SketchContribution {
     @inject(BoardsDataStore)
     protected readonly boardsDataStore: BoardsDataStore;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClientImpl: BoardsServiceClientImpl;
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClientImpl: BoardsServiceProvider;
 
     @inject(OutputChannelManager)
     protected readonly outputChannelManager: OutputChannelManager;
@@ -77,40 +77,30 @@ export class UploadSketch extends SketchContribution {
         if (!uri) {
             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;
-            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 the '${boardsConfig.selectedBoard.name}' board. Please install the core.`);
-            }
-
             const [fqbn, { selectedProgrammer }] = await Promise.all([
-                this.boardsDataStore.appendConfigToFqbn(boardsConfig.selectedBoard.fqbn),
-                this.boardsDataStore.getData(boardsConfig.selectedBoard.fqbn)
+                this.boardsDataStore.appendConfigToFqbn(boardsConfig.selectedBoard?.fqbn),
+                this.boardsDataStore.getData(boardsConfig.selectedBoard?.fqbn)
             ]);
 
             let options: CoreService.Upload.Options | undefined = undefined;
             const sketchUri = uri;
             const optimizeForDebug = this.editorMode.compileForDebug;
             const { selectedPort } = boardsConfig;
+            const port = selectedPort?.address;
 
             if (usingProgrammer) {
                 const programmer = selectedProgrammer;
-                if (!programmer) {
-                    throw new Error('Programmer is not selected. Please select a programmer.');
-                }
-                let port: undefined | string = undefined;
-                // If the port is set by the user, we pass it to the CLI as it might be required.
-                // If it is not set but the CLI requires it, we let the CLI to complain.
-                if (selectedPort) {
-                    port = selectedPort.address;
-                }
                 options = {
                     sketchUri,
                     fqbn,
@@ -119,10 +109,6 @@ export class UploadSketch extends SketchContribution {
                     port
                 };
             } else {
-                if (!selectedPort) {
-                    throw new Error('No ports selected. Please select a port.');
-                }
-                const port = selectedPort.address;
                 options = {
                     sketchUri,
                     fqbn,
@@ -131,13 +117,28 @@ export class UploadSketch extends SketchContribution {
                 };
             }
             this.outputChannelManager.getChannel('Arduino: upload').clear();
-            await this.coreService.upload(options);
+            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 {
             if (monitorConfig) {
-                await this.monitorConnection.connect(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()}`);
+                }
             }
         }
     }

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

@@ -4,7 +4,7 @@ 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 { BoardsServiceClientImpl } from '../boards/boards-service-client-impl';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
 import { SketchContribution, Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, TabBarToolbarRegistry } from './contribution';
 
 @injectable()
@@ -16,8 +16,8 @@ export class VerifySketch extends SketchContribution {
     @inject(BoardsDataStore)
     protected readonly boardsDataStore: BoardsDataStore;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClientImpl: BoardsServiceClientImpl;
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClientImpl: BoardsServiceProvider;
 
     @inject(OutputChannelManager)
     protected readonly outputChannelManager: OutputChannelManager;
@@ -63,13 +63,7 @@ export class VerifySketch extends SketchContribution {
         }
         try {
             const { boardsConfig } = this.boardsServiceClientImpl;
-            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 the '${boardsConfig.selectedBoard.name}' board. Please install the core.`);
-            }
-            const fqbn = await this.boardsDataStore.appendConfigToFqbn(boardsConfig.selectedBoard.fqbn);
+            const fqbn = await this.boardsDataStore.appendConfigToFqbn(boardsConfig.selectedBoard?.fqbn);
             this.outputChannelManager.getChannel('Arduino: compile').clear();
             await this.coreService.compile({
                 sketchUri: uri,

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

@@ -1,36 +0,0 @@
-import { injectable, inject } from 'inversify';
-import { Emitter, Event } 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 { CoreServiceClient } from '../common/protocol';
-
-@injectable()
-export class CoreServiceClientImpl implements CoreServiceClient {
-
-    @inject(ILogger)
-    protected logger: ILogger;
-
-    @inject(MessageService)
-    protected messageService: MessageService;
-
-    @inject(LocalStorageService)
-    protected storageService: LocalStorageService;
-
-    protected readonly onIndexUpdatedEmitter = new Emitter<void>();
-
-    notifyIndexUpdated(): void {
-        this.info('Index has been updated.');
-        this.onIndexUpdatedEmitter.fire();
-    }
-
-    get onIndexUpdated(): Event<void> {
-        return this.onIndexUpdatedEmitter.event;
-    }
-
-    protected info(message: string): void {
-        this.messageService.info(message, { timeout: 3000 });
-        this.logger.info(message);
-    }
-
-}

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,40 +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';
-
-@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));
-    }
-
-    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,17 @@
-import { inject, injectable } from 'inversify';
-import { Library, LibraryService } from '../../common/protocol/library-service';
+import { injectable, postConstruct, inject } from 'inversify';
+import { LibraryPackage, LibraryService } from '../../common/protocol/library-service';
 import { ListWidget } from '../widgets/component-list/list-widget';
 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 +19,18 @@ 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)),
+        ]);
+    }
+
 }

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

@@ -1,6 +1,6 @@
-import { MAIN_MENU_BAR } from '@theia/core/lib/common/menu';
+import { isOSX } from '@theia/core/lib/common/os';
 import { CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';
-import { isOSX } from '@theia/core';
+import { MAIN_MENU_BAR } from '@theia/core/lib/common/menu';
 
 export namespace ArduinoMenus {
 
@@ -12,6 +12,13 @@ export namespace ArduinoMenus {
     export const FILE__SETTINGS_GROUP = [...(isOSX ? MAIN_MENU_BAR : CommonMenus.FILE), '2_settings'];
     export const FILE__QUIT_GROUP = [...CommonMenus.FILE, '3_quit'];
 
+    // -- File / Examples
+    export const FILE__EXAMPLES_SUBMENU = [...FILE__SKETCH_GROUP, '0_examples'];
+    export const EXAMPLES__BUILT_IN_GROUP = [...FILE__EXAMPLES_SUBMENU, '0_built_ins'];
+    export const EXAMPLES__ANY_BOARD_GROUP = [...FILE__EXAMPLES_SUBMENU, '1_any_board'];
+    export const EXAMPLES__CURRENT_BOARD_GROUP = [...FILE__EXAMPLES_SUBMENU, '2_current_board'];
+    export const EXAMPLES__USER_LIBS_GROUP = [...FILE__EXAMPLES_SUBMENU, '3_user_libs'];
+
     // -- Edit
     // `Copy`, `Copy to Forum`, `Paste`, etc.
     // Note: `1_undo` is the first group from Theia, we start with `2`
@@ -30,10 +37,17 @@ export namespace ArduinoMenus {
     export const TOOLS = [...MAIN_MENU_BAR, '4_tools'];
     // `Auto Format`, `Library Manager...`, `Boards Manager...`
     export const TOOLS__MAIN_GROUP = [...TOOLS, '0_main'];
-    // Core settings, such as `Processor` and `Programmers` for the board.
+    // Core settings, such as `Processor` and `Programmers` for the board and `Burn Bootloader`
     export const TOOLS__BOARD_SETTINGS_GROUP = [...TOOLS, '1_board_settings'];
 
-    // Context menu
+    // -- Help
+    // `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'];

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

@@ -4,11 +4,12 @@ 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 { 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 {
@@ -25,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;
@@ -110,11 +114,11 @@ export class MonitorConnection {
                 }
             }
         });
-        this.boardsServiceClient.onBoardsConfigChanged(this.handleBoardConfigChange.bind(this));
-        this.boardsServiceClient.onAttachedBoardsChanged(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 => !!board.port && BoardsConfig.Config.sameAs(boardsConfig, board))) {
                         const { selectedBoard: board, selectedPort: port } = boardsConfig;
@@ -128,7 +132,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);
             }
         });
@@ -154,7 +158,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) {
@@ -227,7 +231,7 @@ export class MonitorConnection {
 
     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 => {

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-widget.tsx

@@ -5,7 +5,7 @@ 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';
@@ -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));
     }

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

@@ -0,0 +1,92 @@
+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 } 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 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;
+
+    @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);
+    }
+
+}

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

@@ -0,0 +1,28 @@
+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 { name, chunk } = message;
+        const channel = this.outputChannelManager.getChannel(`Arduino: ${name}`);
+        // Zen-mode: we do not reveal the output for daemon messages.
+        const show: Promise<any> = name === 'daemon'
+            // This will open and reveal the view but won't show it. You will see the toggle bottom panel on the status bar.
+            ? this.outputContribution.openView({ activate: false, reveal: false })
+            // This will open, reveal but do not activate the Output view.
+            : Promise.resolve(channel.show({ preserveFocus: true }));
+
+        show.then(() => channel.append(chunk));
+    }
+
+}

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

@@ -0,0 +1,6 @@
+/* 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);
+}

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

@@ -5,6 +5,7 @@
 @import './arduino-select.css';
 @import './status-bar.css';
 @import './terminal.css';
+@import './editor.css';
 
 .theia-input.warning:focus {
     outline-width: 1px;

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

@@ -64,6 +64,23 @@
     mask-position: 28px -4px;
 }
 
+.arduino-start-debug-icon {
+    -webkit-mask: url('../icons/debug-dark.svg') 50%;
+    mask: url('../icons/debug-dark.svg') 50%;
+    -webkit-mask-size: 100%;
+    mask-size: 100%;
+    -webkit-mask-repeat: no-repeat;
+    mask-repeat: no-repeat;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: var(--theia-ui-button-font-color);
+}
+
+.arduino-start-debug {
+    border-radius: 12px;
+}
+
 #arduino-toolbar-container {
     display: flex;
     width: 100%;

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

@@ -1,8 +1,6 @@
-.p-TabBar.theia-app-centers .p-TabBar-tabIcon.arduino-serial-monitor-tab-icon {
-    background: url(../icons/buttons.svg);
-    background-size: 800%;
-    background-position-y: 41px;
-    background-position-x: 19px;
+.monitor-tab-icon {
+    -webkit-mask: url('../icons/monitor-tab-icon.svg');
+    mask: url('../icons/monitor-tab-icon.svg');
 }
 
 .serial-monitor {

arduino-ide-extension/src/browser/theia/core/about-dialog.ts

@@ -1,25 +0,0 @@
-import { injectable, inject, postConstruct } from 'inversify';
-import { AboutDialog as TheiaAboutDialog, ABOUT_CONTENT_CLASS } from '@theia/core/lib/browser/about-dialog';
-import { ConfigService } from '../../../common/protocol/config-service';
-
-@injectable()
-export class AboutDialog extends TheiaAboutDialog {
-
-    @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/theia/core/application-shell.ts

@@ -2,7 +2,9 @@
 import { injectable, inject } from 'inversify';
 import { EditorWidget } from '@theia/editor/lib/browser';
 import { CommandService } from '@theia/core/lib/common/command';
+import { MessageService } from '@theia/core/lib/common/message-service';
 import { OutputWidget } from '@theia/output/lib/browser/output-widget';
+import { ConnectionStatusService, ConnectionStatus } from '@theia/core/lib/browser/connection-status-service';
 import { ApplicationShell as TheiaApplicationShell, Widget } from '@theia/core/lib/browser';
 import { Sketch } from '../../../common/protocol';
 import { EditorMode } from '../../editor-mode';
@@ -18,9 +20,15 @@ export class ApplicationShell extends TheiaApplicationShell {
     @inject(CommandService)
     protected readonly commandService: CommandService;
 
+    @inject(MessageService)
+    protected readonly messageService: MessageService;
+
     @inject(SketchesServiceClientImpl)
     protected readonly sketchesServiceClient: SketchesServiceClientImpl;
 
+    @inject(ConnectionStatusService)
+    protected readonly connectionStatusService: ConnectionStatusService;
+
     protected track(widget: Widget): void {
         super.track(widget);
         if (widget instanceof OutputWidget) {
@@ -60,6 +68,10 @@ export class ApplicationShell extends TheiaApplicationShell {
     }
 
     async saveAll(): Promise<void> {
+        if (this.connectionStatusService.currentStatus === ConnectionStatus.OFFLINE) {
+            this.messageService.error('Could not save the sketch. Please copy your unsaved work into your favorite text editor, and restart the IDE.');
+            return; // Theia does not reject on failed save: https://github.com/eclipse-theia/theia/pull/8803
+        }
         await super.saveAll();
         const options = { execOnlyIfTemp: true, openAfterMove: true };
         await this.commandService.executeCommand(SaveAsSketch.Commands.SAVE_AS_SKETCH.id, options);

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

@@ -19,7 +19,8 @@ export class CommonFrontendContribution extends TheiaCommonFrontendContribution
             CommonCommands.AUTO_SAVE,
             CommonCommands.OPEN_PREFERENCES,
             CommonCommands.SELECT_ICON_THEME,
-            CommonCommands.SELECT_COLOR_THEME
+            CommonCommands.SELECT_COLOR_THEME,
+            CommonCommands.ABOUT_COMMAND
         ]) {
             registry.unregisterMenuAction(command);
         }

arduino-ide-extension/src/browser/theia/core/connection-status-service.ts

@@ -6,20 +6,30 @@ import {
     ApplicationConnectionStatusContribution as TheiaApplicationConnectionStatusContribution,
     ConnectionStatus
 } from '@theia/core/lib/browser/connection-status-service';
-import { ArduinoDaemonClientImpl } from '../../arduino-daemon-client-impl';
+import { ArduinoDaemon } from '../../../common/protocol';
+import { NotificationCenter } from '../../notification-center';
 
 @injectable()
 export class FrontendConnectionStatusService extends TheiaFrontendConnectionStatusService {
 
-    @inject(ArduinoDaemonClientImpl)
-    protected readonly daemonClient: ArduinoDaemonClientImpl;
+    @inject(ArduinoDaemon)
+    protected readonly daemon: ArduinoDaemon;
+
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
+
+    protected isRunning = false;
 
     @postConstruct()
-    protected init(): void {
+    protected async init(): Promise<void> {
         this.schedulePing();
+        try {
+            this.isRunning = await this.daemon.isRunning();
+        } catch { }
+        this.notificationCenter.onDaemonStarted(() => this.isRunning = true);
+        this.notificationCenter.onDaemonStopped(() => this.isRunning = false);
         this.wsConnectionProvider.onIncomingMessageActivity(() => {
-            // natural activity
-            this.updateStatus(this.daemonClient.isRunning);
+            this.updateStatus(this.isRunning);
             this.schedulePing();
         });
     }
@@ -29,22 +39,35 @@ export class FrontendConnectionStatusService extends TheiaFrontendConnectionStat
 @injectable()
 export class ApplicationConnectionStatusContribution extends TheiaApplicationConnectionStatusContribution {
 
-    @inject(ArduinoDaemonClientImpl)
-    protected readonly daemonClient: ArduinoDaemonClientImpl;
+    @inject(ArduinoDaemon)
+    protected readonly daemon: ArduinoDaemon;
+
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
+
+    protected isRunning = false;
+
+    @postConstruct()
+    protected async init(): Promise<void> {
+        try {
+            this.isRunning = await this.daemon.isRunning();
+        } catch { }
+        this.notificationCenter.onDaemonStarted(() => this.isRunning = true);
+        this.notificationCenter.onDaemonStopped(() => this.isRunning = false);
+    }
 
     protected onStateChange(state: ConnectionStatus): void {
-        if (!this.daemonClient.isRunning && state === ConnectionStatus.ONLINE) {
+        if (!this.isRunning && state === ConnectionStatus.ONLINE) {
             return;
         }
         super.onStateChange(state);
     }
 
     protected handleOffline(): void {
-        const { isRunning } = this.daemonClient;
         this.statusBar.setElement('connection-status', {
             alignment: StatusBarAlignment.LEFT,
-            text: isRunning ? 'Offline' : '$(bolt) CLI Daemon Offline',
-            tooltip: isRunning ? 'Cannot connect to the backend.' : 'Cannot connect to the CLI daemon.',
+            text: this.isRunning ? 'Offline' : '$(bolt) CLI Daemon Offline',
+            tooltip: this.isRunning ? 'Cannot connect to the backend.' : 'Cannot connect to the CLI daemon.',
             priority: 5000
         });
         this.toDisposeOnOnline.push(Disposable.create(() => this.statusBar.removeElement('connection-status')));

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

@@ -1,5 +1,5 @@
 import { injectable, inject } from 'inversify';
-import { FileSystem } from '@theia/filesystem/lib/common/filesystem';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { CommandService } from '@theia/core/lib/common/command';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import { FrontendApplication as TheiaFrontendApplication } from '@theia/core/lib/browser/frontend-application';
@@ -8,8 +8,8 @@ import { ArduinoCommands } from '../../arduino-commands';
 @injectable()
 export class FrontendApplication extends TheiaFrontendApplication {
 
-    @inject(FileSystem)
-    protected readonly fileSystem: FileSystem;
+    @inject(FileService)
+    protected readonly fileService: FileService;
 
     @inject(WorkspaceService)
     protected readonly workspaceService: WorkspaceService;
@@ -21,9 +21,9 @@ export class FrontendApplication extends TheiaFrontendApplication {
         await super.initializeLayout();
         const roots = await this.workspaceService.roots;
         for (const root of roots) {
-            const exists = await this.fileSystem.exists(root.uri);
+            const exists = await this.fileService.exists(root.resource);
             if (exists) {
-                await this.commandService.executeCommand(ArduinoCommands.OPEN_SKETCH_FILES.id, root.uri);
+                await this.commandService.executeCommand(ArduinoCommands.OPEN_SKETCH_FILES.id, root.resource);
             }
         }
     }

arduino-ide-extension/src/browser/theia/core/tab-bar-decorator.ts

@@ -1,11 +1,11 @@
 import { inject, injectable, postConstruct } from 'inversify';
 import URI from '@theia/core/lib/common/uri';
 import { Title, Widget } from '@phosphor/widgets';
-import { ILogger } from '@theia/core';
+import { ILogger } from '@theia/core/lib/common/logger';
+import { EditorWidget } from '@theia/editor/lib/browser';
 import { WidgetDecoration } from '@theia/core/lib/browser/widget-decoration';
 import { TabBarDecoratorService as TheiaTabBarDecoratorService } from '@theia/core/lib/browser/shell/tab-bar-decorator';
 import { ConfigService } from '../../../common/protocol/config-service';
-import { EditorWidget } from '@theia/editor/lib/browser';
 
 @injectable()
 export class TabBarDecoratorService extends TheiaTabBarDecoratorService {
@@ -20,7 +20,6 @@ export class TabBarDecoratorService extends TheiaTabBarDecoratorService {
 
     @postConstruct()
     protected init(): void {
-        super.init();
         this.configService.getConfiguration()
             .then(({ dataDirUri }) => this.dataDirUri = new URI(dataDirUri))
             .catch(err => this.logger.error(`Failed to determine the data directory: ${err}`));

arduino-ide-extension/src/browser/theia/core/tab-bars.ts

@@ -0,0 +1,15 @@
+import { TabBar } from '@phosphor/widgets';
+import { Saveable } from '@theia/core/lib/browser/saveable';
+import { TabBarRenderer as TheiaTabBarRenderer } from '@theia/core/lib/browser/shell/tab-bars';
+
+export class TabBarRenderer extends TheiaTabBarRenderer {
+
+    createTabClass(data: TabBar.IRenderData<any>): string {
+        let className = super.createTabClass(data);
+        if (!data.title.closable && Saveable.isDirty(data.title.owner)) {
+            className += ' p-mod-closable';
+        }
+        return className;
+    }
+
+}

arduino-ide-extension/src/browser/theia/debug/debug-session-manager.ts

@@ -0,0 +1,45 @@
+import { injectable } from 'inversify';
+import { DebugError } from '@theia/debug/lib/common/debug-service';
+import { DebugSession } from '@theia/debug/lib/browser/debug-session';
+import { DebugSessionOptions } from '@theia/debug/lib/browser/debug-session-options';
+import { DebugSessionManager as TheiaDebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
+
+@injectable()
+export class DebugSessionManager extends TheiaDebugSessionManager {
+
+    async start(options: DebugSessionOptions): Promise<DebugSession | undefined> {
+        return this.progressService.withProgress('Start...', 'debug', async () => {
+            try {
+                // Only save when dirty. To avoid saving temporary sketches.
+                // This is a quick fix for not saving the editor when there are no dirty editors.
+                // // https://github.com/bcmi-labs/arduino-editor/pull/172#issuecomment-741831888
+                if (this.shell.canSaveAll()) {
+                    await this.shell.saveAll();
+                }
+                await this.fireWillStartDebugSession();
+                const resolved = await this.resolveConfiguration(options);
+
+                // preLaunchTask isn't run in case of auto restart as well as postDebugTask
+                if (!options.configuration.__restart) {
+                    const taskRun = await this.runTask(options.workspaceFolderUri, resolved.configuration.preLaunchTask, true);
+                    if (!taskRun) {
+                        return undefined;
+                    }
+                }
+
+                const sessionId = await this.debug.createDebugSession(resolved.configuration);
+                return this.doStart(sessionId, resolved);
+            } catch (e) {
+                if (DebugError.NotFound.is(e)) {
+                    this.messageService.error(`The debug session type "${e.data.type}" is not supported.`);
+                    return undefined;
+                }
+
+                this.messageService.error('There was an error starting the debug session, check the logs for more details.');
+                console.error('Error starting the debug session', e);
+                throw e;
+            }
+        });
+    }
+
+}

arduino-ide-extension/src/browser/theia/editor/editor-command.ts

@@ -0,0 +1,21 @@
+import { injectable, postConstruct } from 'inversify';
+import { EditorCommandContribution as TheiaEditorCommandContribution } from '@theia/editor/lib/browser/editor-command';
+
+@injectable()
+export class EditorCommandContribution extends TheiaEditorCommandContribution {
+
+    @postConstruct()
+    protected init(): void {
+        // Workaround for https://github.com/eclipse-theia/theia/issues/8722.
+        this.editorPreferences.onPreferenceChanged(({ preferenceName, newValue, oldValue }) => {
+            if (preferenceName === 'editor.autoSave') {
+                const autoSaveWasOnBeforeChange = !oldValue || oldValue === 'on';
+                const autoSaveIsOnAfterChange = !newValue || newValue === 'on';
+                if (!autoSaveWasOnBeforeChange && autoSaveIsOnAfterChange) {
+                    this.shell.saveAll();
+                }
+            }
+        });
+    }
+
+}

arduino-ide-extension/src/browser/theia/monaco/monaco-text-model-service.ts

@@ -0,0 +1,29 @@
+import { injectable } from 'inversify';
+import { Resource } from '@theia/core/lib/common/resource';
+import { MaybePromise } from '@theia/core/lib/common/types';
+import { Log, Loggable } from '@theia/core/lib/common/logger';
+import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
+import { MonacoTextModelService as TheiaMonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
+
+@injectable()
+export class MonacoTextModelService extends TheiaMonacoTextModelService {
+
+    protected createModel(resource: Resource): MaybePromise<MonacoEditorModel> {
+        const factory = this.factories.getContributions().find(({ scheme }) => resource.uri.scheme === scheme);
+        return factory ? factory.createModel(resource) : new SilentMonacoEditorModel(resource, this.m2p, this.p2m, this.logger);
+    }
+
+}
+
+// https://github.com/eclipse-theia/theia/pull/8491
+export class SilentMonacoEditorModel extends MonacoEditorModel {
+
+    protected trace(loggable: Loggable): void {
+        if (this.logger) {
+            this.logger.trace((log: Log) =>
+                loggable((message, ...params) => log(message, ...params, this.resource.uri.toString(true)))
+            );
+        }
+    }
+
+}

arduino-ide-extension/src/browser/theia/navigator/navigator-tab-bar-decorator.ts

@@ -0,0 +1,21 @@
+import { injectable } from 'inversify';
+import { WidgetDecoration } from '@theia/core/lib/browser/widget-decoration';
+import { NavigatorTabBarDecorator as TheiaNavigatorTabBarDecorator } from '@theia/navigator/lib/browser/navigator-tab-bar-decorator';
+
+/**
+ * To silent the badge decoration in the `Explorer`.
+ * https://github.com/eclipse-theia/theia/issues/8709
+ */
+@injectable()
+export class NavigatorTabBarDecorator extends TheiaNavigatorTabBarDecorator {
+
+    onStart(): void {
+        // NOOP
+    }
+
+    decorate(): WidgetDecoration.Data[] {
+        // Does not decorate anything.
+        return [];
+    }
+
+}

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

@@ -9,6 +9,14 @@ export class OutlineViewContribution extends TheiaOutlineViewContribution {
     @inject(EditorMode)
     protected readonly editorMode: EditorMode;
 
+    constructor() {
+        super();
+        this.options.defaultWidgetOptions = {
+            area: 'left',
+            rank: 500
+        };
+    }
+
     async initializeLayout(app: FrontendApplication): Promise<void> {
         if (this.editorMode.proMode) {
             return super.initializeLayout(app);

arduino-ide-extension/src/browser/theia/output/output-channel.ts

@@ -0,0 +1,53 @@
+import * as PQueue from 'p-queue';
+import { injectable } from 'inversify';
+import { Deferred } from '@theia/core/lib/common/promise-util';
+import { OutputUri } from '@theia/output/lib/common/output-uri';
+import { IReference } from '@theia/monaco/lib/browser/monaco-text-model-service';
+import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
+import { OutputChannelManager as TheiaOutputChannelManager, OutputChannel as TheiaOutputChannel } from '@theia/output/lib/common/output-channel';
+
+@injectable()
+export class OutputChannelManager extends TheiaOutputChannelManager {
+
+    getChannel(name: string): TheiaOutputChannel {
+        const existing = this.channels.get(name);
+        if (existing) {
+            return existing;
+        }
+
+        // We have to register the resource first, because `textModelService#createModelReference` will require it
+        // right after creating the monaco.editor.ITextModel.
+        // All `append` and `appendLine` will be deferred until the underlying text-model instantiation.
+        let resource = this.resources.get(name);
+        if (!resource) {
+            const uri = OutputUri.create(name);
+            const editorModelRef = new Deferred<IReference<MonacoEditorModel>>();
+            resource = this.createResource({ uri, editorModelRef });
+            this.resources.set(name, resource);
+            this.textModelService.createModelReference(uri).then(ref => editorModelRef.resolve(ref));
+        }
+
+        const channel = new OutputChannel(resource, this.preferences);
+        this.channels.set(name, channel);
+        this.toDisposeOnChannelDeletion.set(name, this.registerListeners(channel));
+        this.channelAddedEmitter.fire(channel);
+        if (!this.selectedChannel) {
+            this.selectedChannel = channel;
+        }
+        return channel;
+    }
+
+}
+
+export class OutputChannel extends TheiaOutputChannel {
+
+    dispose(): void {
+        super.dispose();
+        if ((this as any).disposed) {
+            const textModifyQueue: PQueue = (this as any).textModifyQueue;
+            textModifyQueue.pause();
+            textModifyQueue.clear();
+        }
+    }
+
+}

arduino-ide-extension/src/browser/theia/plugin-ext/output-channel-registry-main.ts

@@ -0,0 +1,38 @@
+import { injectable, inject } from 'inversify';
+import { CommandService } from '@theia/core/lib/common/command';
+import { OutputCommands } from '@theia/output/lib/browser/output-commands';
+import { PluginInfo } from '@theia/plugin-ext/lib/common/plugin-api-rpc';
+import { OutputChannelRegistryMainImpl as TheiaOutputChannelRegistryMainImpl } from '@theia/plugin-ext/lib/main/browser/output-channel-registry-main';
+
+@injectable()
+export class OutputChannelRegistryMainImpl extends TheiaOutputChannelRegistryMainImpl {
+
+    @inject(CommandService)
+    protected readonly commandService: CommandService;
+
+    $append(name: string, text: string, pluginInfo: PluginInfo): PromiseLike<void> {
+        this.commandService.executeCommand(OutputCommands.APPEND.id, { name, text });
+        return Promise.resolve();
+    }
+
+    $clear(name: string): PromiseLike<void> {
+        this.commandService.executeCommand(OutputCommands.CLEAR.id, { name });
+        return Promise.resolve();
+    }
+
+    $dispose(name: string): PromiseLike<void> {
+        this.commandService.executeCommand(OutputCommands.DISPOSE.id, { name });
+        return Promise.resolve();
+    }
+
+    async $reveal(name: string, preserveFocus: boolean): Promise<void> {
+        const options = { preserveFocus };
+        this.commandService.executeCommand(OutputCommands.SHOW.id, { name, options });
+    }
+
+    $close(name: string): PromiseLike<void> {
+        this.commandService.executeCommand(OutputCommands.HIDE.id, { name });
+        return Promise.resolve();
+    }
+
+}

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

@@ -1,7 +1,7 @@
 import { inject, injectable } from 'inversify';
 import URI from '@theia/core/lib/common/uri';
 import { open } from '@theia/core/lib/browser/opener-service';
-import { FileStat } from '@theia/filesystem/lib/common';
+import { FileStat } from '@theia/filesystem/lib/common/files';
 import { CommandRegistry, CommandService } from '@theia/core/lib/common/command';
 import { WorkspaceCommandContribution as TheiaWorkspaceCommandContribution, WorkspaceCommands } from '@theia/workspace/lib/browser/workspace-commands';
 import { Sketch } from '../../../common/protocol';
@@ -40,7 +40,7 @@ export class WorkspaceCommandContribution extends TheiaWorkspaceCommandContribut
             return;
         }
 
-        const parentUri = new URI(parent.uri);
+        const parentUri = parent.resource;
         const dialog = new WorkspaceInputDialog({
             title: 'Name for new file',
             parentUri,
@@ -51,7 +51,7 @@ export class WorkspaceCommandContribution extends TheiaWorkspaceCommandContribut
         const nameWithExt = this.maybeAppendInoExt(name);
         if (nameWithExt) {
             const fileUri = parentUri.resolve(nameWithExt);
-            await this.fileSystem.createFile(fileUri.toString());
+            await this.fileService.createFile(fileUri);
             this.fireCreateNewFile({ parent: parentUri, uri: fileUri });
             open(this.openerService, fileUri);
         }
@@ -132,7 +132,7 @@ export class WorkspaceCommandContribution extends TheiaWorkspaceCommandContribut
         if (newNameWithExt) {
             const oldUri = uri;
             const newUri = uri.parent.resolve(newNameWithExt);
-            this.fileSystem.move(oldUri.toString(), newUri.toString());
+            this.fileService.move(oldUri, newUri);
         }
     }
 

arduino-ide-extension/src/browser/theia/workspace/workspace-delete-handler.ts

@@ -25,7 +25,7 @@ export class WorkspaceDeleteHandler extends TheiaWorkspaceDeleteHandler {
             });
             if (response === 1) { // OK
                 await Promise.all([...sketch.additionalFileUris, ...sketch.otherSketchFileUris, sketch.mainFileUri].map(uri => this.closeWithoutSaving(new URI(uri))));
-                await this.fileSystem.delete(sketch.uri);
+                await this.fileService.delete(new URI(sketch.uri));
                 window.close();
             }
             return;

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

@@ -7,6 +7,7 @@ import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
 import { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
 import { FocusTracker, Widget } from '@theia/core/lib/browser';
 import { WorkspaceService as TheiaWorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
 import { ConfigService } from '../../../common/protocol/config-service';
 import { SketchesService } from '../../../common/protocol/sketches-service';
 import { ArduinoWorkspaceRootResolver } from '../../arduino-workspace-resolver';
@@ -74,7 +75,7 @@ export class WorkspaceService extends TheiaWorkspaceService {
     }
 
     private async isValid(uri: string): Promise<boolean> {
-        const exists = await this.fileSystem.exists(uri);
+        const exists = await this.fileService.exists(new URI(uri));
         if (!exists) {
             return false;
         }
@@ -97,15 +98,15 @@ export class WorkspaceService extends TheiaWorkspaceService {
     }
 
     protected formatTitle(title?: string): string {
+        const status = FrontendApplicationConfigProvider.get()['status'];
         const version = this.version ? ` ${this.version}` : '';
-        const name = `${this.applicationName} ${version}`;
+        const name = `${this.applicationName}${status ? ` – ${status}` : ''} ${version}`;
         return title ? `${title} | ${name}` : name;
     }
 
     protected get workspaceTitle(): string | undefined {
         if (this.workspace) {
-            const uri = new URI(this.workspace.uri);
-            return this.labelProvider.getName(uri);
+            return this.labelProvider.getName(this.workspace.resource);
         }
     }
 

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

@@ -1,41 +0,0 @@
-import { injectable, inject } from 'inversify';
-import { OutputContribution } from '@theia/output/lib/browser/output-contribution';
-import { OutputChannelManager, OutputChannelSeverity } from '@theia/output/lib/common/output-channel';
-import { ToolOutputServiceClient, ToolOutputMessage } from '../../common/protocol/tool-output-service';
-
-@injectable()
-export class ToolOutputServiceClientImpl implements ToolOutputServiceClient {
-
-    @inject(OutputContribution)
-    protected outputContribution: OutputContribution;
-
-    @inject(OutputChannelManager)
-    protected outputChannelManager: OutputChannelManager;
-
-    onMessageReceived(message: ToolOutputMessage): void {
-        const { tool, chunk } = message;
-        const name = `Arduino: ${tool}`;
-        const channel = this.outputChannelManager.getChannel(name);
-        // Zen-mode: we do not reveal the output for daemon messages.
-        const show: Promise<any> = tool === 'daemon'
-            // This will open and reveal the view but won't show it. You will see the toggle bottom panel on the status bar
-            ? this.outputContribution.openView({ activate: false, reveal: false })
-            // This will open, reveal but do not activate the Output view.
-            : Promise.resolve(channel.show({ preserveFocus: true }));
-
-        show.then(() => channel.append(chunk, this.toOutputSeverity(message)));
-    }
-
-    private toOutputSeverity(message: ToolOutputMessage): OutputChannelSeverity {
-        if (message.severity) {
-            switch (message.severity) {
-                case 'error': return OutputChannelSeverity.Error
-                case 'warning': return OutputChannelSeverity.Warning
-                case 'info': return OutputChannelSeverity.Info
-                default: return OutputChannelSeverity.Info
-            }
-        }
-        return OutputChannelSeverity.Info
-    }
-
-}

arduino-ide-extension/src/browser/widgets/component-list/list-widget.tsx

@@ -10,17 +10,13 @@ import { Searchable } from '../../../common/protocol/searchable';
 import { ArduinoComponent } from '../../../common/protocol/arduino-component';
 import { FilterableListContainer } from './filterable-list-container';
 import { ListItemRenderer } from './list-item-renderer';
-import { CoreServiceClientImpl } from '../../core-service-client-impl';
-import { ArduinoDaemonClientImpl } from '../../arduino-daemon-client-impl';
+import { NotificationCenter } from '../../notification-center';
 
 @injectable()
 export abstract class ListWidget<T extends ArduinoComponent> extends ReactWidget {
 
-    @inject(CoreServiceClientImpl)
-    protected readonly coreServiceClient: CoreServiceClientImpl;
-
-    @inject(ArduinoDaemonClientImpl)
-    protected readonly daemonClient: ArduinoDaemonClientImpl;
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
 
     /**
      * Do not touch or use it. It is for setting the focus on the `input` after the widget activation.
@@ -49,9 +45,9 @@ export abstract class ListWidget<T extends ArduinoComponent> extends ReactWidget
     protected init(): void {
         this.update();
         this.toDispose.pushAll([
-            this.coreServiceClient.onIndexUpdated(() => this.refresh(undefined)),
-            this.daemonClient.onDaemonStarted(() => this.refresh(undefined)),
-            this.daemonClient.onDaemonStopped(() => this.refresh(undefined))
+            this.notificationCenter.onIndexUpdated(() => this.refresh(undefined)),
+            this.notificationCenter.onDaemonStarted(() => this.refresh(undefined)),
+            this.notificationCenter.onDaemonStopped(() => this.refresh(undefined))
         ]);
     }
 

arduino-ide-extension/src/common/protocol/arduino-component.ts

@@ -12,3 +12,15 @@ export interface ArduinoComponent {
 
     readonly installedVersion?: Installable.Version;
 }
+export namespace ArduinoComponent {
+
+    export function is(arg: any): arg is ArduinoComponent {
+        return !!arg
+            && 'name' in arg && typeof arg['name'] === 'string'
+            && 'author' in arg && typeof arg['author'] === 'string'
+            && 'summary' in arg && typeof arg['summary'] === 'string'
+            && 'description' in arg && typeof arg['description'] === 'string'
+            && 'installable' in arg && typeof arg['installable'] === 'boolean';
+    }
+
+}

arduino-ide-extension/src/common/protocol/arduino-daemon.ts

@@ -1,13 +1,5 @@
-import { JsonRpcServer } from '@theia/core/lib/common/messaging/proxy-factory';
-
-export const ArduinoDaemonClient = Symbol('ArduinoDaemonClient');
-export interface ArduinoDaemonClient {
-    notifyStarted(): void;
-    notifyStopped(): void;
-}
-
 export const ArduinoDaemonPath = '/services/arduino-daemon';
 export const ArduinoDaemon = Symbol('ArduinoDaemon');
-export interface ArduinoDaemon extends JsonRpcServer<ArduinoDaemonClient> {
+export interface ArduinoDaemon {
     isRunning(): Promise<boolean>;
 }

arduino-ide-extension/src/common/protocol/boards-service.ts

@@ -1,16 +1,56 @@
 import { isWindows, isOSX } from '@theia/core/lib/common/os';
-import { JsonRpcServer } from '@theia/core/lib/common/messaging/proxy-factory';
 import { naturalCompare } from './../utils';
 import { Searchable } from './searchable';
 import { Installable } from './installable';
 import { ArduinoComponent } from './arduino-component';
 
+export type AvailablePorts = Record<string, [Port, Array<Board>]>;
+
 export interface AttachedBoardsChangeEvent {
     readonly oldState: Readonly<{ boards: Board[], ports: Port[] }>;
     readonly newState: Readonly<{ boards: Board[], ports: Port[] }>;
 }
 export namespace AttachedBoardsChangeEvent {
 
+    export function isEmpty(event: AttachedBoardsChangeEvent): boolean {
+        const { detached, attached } = diff(event);
+        return !!detached.boards.length && !!detached.ports.length && !!attached.boards.length && !!attached.ports.length;
+    }
+
+    export function toString(event: AttachedBoardsChangeEvent): string {
+        let rows: string[] = [];
+        if (!isEmpty(event)) {
+            const { attached, detached } = diff(event);
+            const visitedAttachedPorts: Port[] = [];
+            const visitedDetachedPorts: Port[] = [];
+            for (const board of attached.boards) {
+                const port = board.port ? ` on ${Port.toString(board.port, { useLabel: true })}` : '';
+                rows.push(` - Attached board: ${Board.toString(board)}${port}`);
+                if (board.port) {
+                    visitedAttachedPorts.push(board.port);
+                }
+            }
+            for (const board of detached.boards) {
+                const port = board.port ? ` from ${Port.toString(board.port, { useLabel: true })}` : '';
+                rows.push(` - Detached board: ${Board.toString(board)}${port}`);
+                if (board.port) {
+                    visitedDetachedPorts.push(board.port);
+                }
+            }
+            for (const port of attached.ports) {
+                if (!visitedAttachedPorts.find(p => Port.sameAs(port, p))) {
+                    rows.push(` - New port is available on ${Port.toString(port, { useLabel: true })}`);
+                }
+            }
+            for (const port of detached.ports) {
+                if (!visitedDetachedPorts.find(p => Port.sameAs(port, p))) {
+                    rows.push(` - Port is no longer available on ${Port.toString(port, { useLabel: true })}`);
+                }
+            }
+        }
+        return rows.length ? rows.join('\n') : 'No changes.';
+    }
+
     export function diff(event: AttachedBoardsChangeEvent): Readonly<{
         attached: {
             boards: Board[],
@@ -45,32 +85,26 @@ export namespace AttachedBoardsChangeEvent {
 
 }
 
-export interface BoardInstalledEvent {
-    readonly pkg: Readonly<BoardsPackage>;
-}
-
-export interface BoardUninstalledEvent {
-    readonly pkg: Readonly<BoardsPackage>;
-}
-
-export const BoardsServiceClient = Symbol('BoardsServiceClient');
-export interface BoardsServiceClient {
-    notifyAttachedBoardsChanged(event: AttachedBoardsChangeEvent): void;
-    notifyBoardInstalled(event: BoardInstalledEvent): void
-    notifyBoardUninstalled(event: BoardUninstalledEvent): void
-}
-
 export const BoardsServicePath = '/services/boards-service';
 export const BoardsService = Symbol('BoardsService');
-export interface BoardsService extends Installable<BoardsPackage>, Searchable<BoardsPackage>, JsonRpcServer<BoardsServiceClient> {
+export interface BoardsService extends Installable<BoardsPackage>, Searchable<BoardsPackage> {
+    /**
+     * Deprecated. `getState` should be used to correctly map a board with a port.
+     * @deprecated
+     */
     getAttachedBoards(): Promise<Board[]>;
+    /**
+     * Deprecated. `getState` should be used to correctly map a board with a port.
+     * @deprecated
+     */
     getAvailablePorts(): Promise<Port[]>;
-    getBoardDetails(options: { fqbn: string }): Promise<BoardDetails>;
+    getState(): Promise<AvailablePorts>;
+    getBoardDetails(options: { fqbn: string }): Promise<BoardDetails | undefined>;
     getBoardPackage(options: { id: string }): Promise<BoardsPackage | undefined>;
     getContainerBoardPackage(options: { fqbn: string }): Promise<BoardsPackage | undefined>;
     // The CLI cannot do fuzzy search. This method provides all boards and we do the fuzzy search (with monaco) on the frontend.
     // https://github.com/arduino/arduino-cli/issues/629
-    allBoards(options: {}): Promise<Array<Board & { packageName: string }>>;
+    allBoards(options: {}): Promise<Array<BoardWithPackage>>;
 }
 
 export interface Port {
@@ -194,6 +228,26 @@ export interface BoardsPackage extends ArduinoComponent {
     readonly id: string;
     readonly boards: Board[];
 }
+export namespace BoardsPackage {
+
+    export function equals(left: BoardsPackage, right: BoardsPackage): boolean {
+        return left.id === right.id;
+    }
+
+    export function contains(selectedBoard: Board, { id, boards }: BoardsPackage): boolean {
+        if (boards.some(board => Board.sameAs(board, selectedBoard))) {
+            return true;
+        }
+        if (selectedBoard.fqbn) {
+            const [platform, architecture] = selectedBoard.fqbn.split(':');
+            if (platform && architecture) {
+                return `${platform}:${architecture}` === id;
+            }
+        }
+        return false;
+    }
+
+}
 
 export interface Board {
     readonly name: string;
@@ -201,11 +255,24 @@ export interface Board {
     readonly port?: Port;
 }
 
+export interface BoardWithPackage extends Board {
+    readonly packageName: string;
+    readonly packageId: string;
+}
+export namespace BoardWithPackage {
+
+    export function is(board: Board & Partial<{ packageName: string, packageId: string }>): board is BoardWithPackage {
+        return !!board.packageId && !!board.packageName;
+    }
+
+}
+
 export interface BoardDetails {
     readonly fqbn: string;
     readonly requiredTools: Tool[];
     readonly configOptions: ConfigOption[];
     readonly programmers: Programmer[];
+    readonly debuggingSupported: boolean;
 }
 
 export interface Tool {
@@ -327,10 +394,10 @@ export namespace Board {
         return `${board.name}${fqbn}`;
     }
 
-    export type Detailed = Board & Readonly<{ selected: boolean, missing: boolean, packageName: string, details?: string }>;
+    export type Detailed = Board & Readonly<{ selected: boolean, missing: boolean, packageName: string, packageId: string, details?: string }>;
     export function decorateBoards(
         selectedBoard: Board | undefined,
-        boards: Array<Board & { packageName: string }>): Array<Detailed> {
+        boards: Array<BoardWithPackage>): Array<Detailed> {
         // 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>();
@@ -340,12 +407,15 @@ export namespace Board {
         }
 
         // Due to the non-unique board names, we have to check the package name as well.
-        const selected = (board: Board & { packageName: string }) => {
+        const selected = (board: BoardWithPackage) => {
             if (!!selectedBoard) {
                 if (Board.equals(board, selectedBoard)) {
                     if ('packageName' in selectedBoard) {
                         return board.packageName === (selectedBoard as any).packageName;
                     }
+                    if ('packageId' in selectedBoard) {
+                        return board.packageId === (selectedBoard as any).packageId;
+                    }
                     return true;
                 }
             }

arduino-ide-extension/src/common/protocol/config-service.ts

@@ -1,15 +1,7 @@
-import { JsonRpcServer } from '@theia/core/lib/common/messaging/proxy-factory';
-
-export const ConfigServiceClient = Symbol('ConfigServiceClient');
-export interface ConfigServiceClient {
-    notifyConfigChanged(config: Config): void;
-    notifyInvalidConfig(): void;
-}
-
 export const ConfigServicePath = '/services/config-service';
 export const ConfigService = Symbol('ConfigService');
-export interface ConfigService extends JsonRpcServer<ConfigServiceClient> {
-    getVersion(): Promise<string>;
+export interface ConfigService {
+    getVersion(): Promise<Readonly<{ version: string, commit: string, status?: string }>>;
     getConfiguration(): Promise<Config>;
     getCliConfigFileUri(): Promise<string>;
     getConfigurationFileSchemaUri(): Promise<string>;

arduino-ide-extension/src/common/protocol/core-service.ts

@@ -1,16 +1,12 @@
-import { JsonRpcServer } from '@theia/core/lib/common/messaging/proxy-factory';
 import { Programmer } from './boards-service';
 
-export const CoreServiceClient = Symbol('CoreServiceClient');
-export interface CoreServiceClient {
-    notifyIndexUpdated(): void;
-}
-
 export const CoreServicePath = '/services/core-service';
 export const CoreService = Symbol('CoreService');
-export interface CoreService extends JsonRpcServer<CoreServiceClient> {
+export interface CoreService {
     compile(options: CoreService.Compile.Options): Promise<void>;
     upload(options: CoreService.Upload.Options): Promise<void>;
+    uploadUsingProgrammer(options: CoreService.Upload.Options): Promise<void>;
+    burnBootloader(options: CoreService.Bootloader.Options): Promise<void>;
 }
 
 export namespace CoreService {
@@ -18,15 +14,24 @@ export namespace CoreService {
     export namespace Compile {
         export interface Options {
             readonly sketchUri: string;
-            readonly fqbn: string;
+            readonly fqbn?: string | undefined;
             readonly optimizeForDebug: boolean;
         }
     }
 
     export namespace Upload {
-        export type Options =
-            Compile.Options & Readonly<{ port: string }> |
-            Compile.Options & Readonly<{ programmer: Programmer, port?: string }>;
+        export interface Options extends Compile.Options {
+            readonly port?: string | undefined;
+            readonly programmer?: Programmer | undefined;
+        }
+    }
+
+    export namespace Bootloader {
+        export interface Options {
+            readonly fqbn?: string | undefined;
+            readonly port?: string | undefined;
+            readonly programmer?: Programmer | undefined;
+        }
     }
 
 }

arduino-ide-extension/src/common/protocol/examples-service.ts

@@ -0,0 +1,14 @@
+import { Sketch } from './sketches-service';
+
+export const ExamplesServicePath = '/services/example-service';
+export const ExamplesService = Symbol('ExamplesService');
+export interface ExamplesService {
+    builtIns(): Promise<ExampleContainer[]>;
+    installed(options: { fqbn: string }): Promise<{ user: ExampleContainer[], current: ExampleContainer[], any: ExampleContainer[] }>;
+}
+
+export interface ExampleContainer {
+    readonly label: string;
+    readonly children: ExampleContainer[];
+    readonly sketches: Sketch[];
+}

arduino-ide-extension/src/common/protocol/executable-service.ts

@@ -0,0 +1,5 @@
+export const ExecutableServicePath = '/services/executable-service';
+export const ExecutableService = Symbol('ExecutableService');
+export interface ExecutableService {
+    list(): Promise<{ clangdUri: string, cliUri: string, lsUri: string }>;
+}

arduino-ide-extension/src/common/protocol/index.ts

@@ -9,4 +9,7 @@ export * from './library-service';
 export * from './monitor-service';
 export * from './searchable';
 export * from './sketches-service';
-export * from './tool-output-service';
+export * from './examples-service';
+export * from './executable-service';
+export * from './output-service';
+export * from './notification-service';

arduino-ide-extension/src/common/protocol/installable.ts

@@ -1,3 +1,4 @@
+import * as semver from 'semver';
 import { naturalCompare } from './../utils';
 import { ArduinoComponent } from './arduino-component';
 
@@ -18,6 +19,11 @@ export namespace Installable {
         /**
          * Most recent version comes first, then the previous versions. (`1.8.1`, `1.6.3`, `1.6.2`, `1.6.1` and so on.)
          */
-        export const COMPARATOR = (left: Version, right: Version) => naturalCompare(right, left);
+        export const COMPARATOR = (left: Version, right: Version) => {
+            if (semver.valid(left) && semver.valid(right)) {
+                return semver.compare(left, right);
+            }
+            return naturalCompare(left, right);
+        };
     }
 }

arduino-ide-extension/src/common/protocol/library-service.ts

@@ -4,10 +4,69 @@ import { ArduinoComponent } from './arduino-component';
 
 export const LibraryServicePath = '/services/library-service';
 export const LibraryService = Symbol('LibraryService');
-export interface LibraryService extends Installable<Library>, Searchable<Library> {
-    install(options: { item: Library, version?: Installable.Version }): Promise<void>;
+export interface LibraryService extends Installable<LibraryPackage>, Searchable<LibraryPackage> {
+    list(options: LibraryService.List.Options): Promise<LibraryPackage[]>;
 }
 
-export interface Library extends ArduinoComponent {
-    readonly builtIn?: boolean;
+export namespace LibraryService {
+    export namespace List {
+        export interface Options {
+            readonly fqbn?: string | undefined;
+        }
+    }
+}
+
+export enum LibraryLocation {
+
+    /**
+     * In the `libraries` subdirectory of the Arduino IDE installation.
+     */
+    IDE_BUILTIN = 0,
+
+    /**
+     * In the `libraries` subdirectory of the user directory (sketchbook).
+     */
+    USER = 1,
+
+    /**
+     * In the `libraries` subdirectory of a platform.
+     */
+    PLATFORM_BUILTIN = 2,
+
+    /**
+     * When `LibraryLocation` is used in a context where a board is specified, this indicates the library is in the `libraries`
+     * subdirectory of a platform referenced by the board's platform.
+     */
+    REFERENCED_PLATFORM_BUILTIN = 3
+
+}
+
+export interface LibraryPackage extends ArduinoComponent {
+
+    /**
+     * Same as [`Library#real_name`](https://arduino.github.io/arduino-cli/latest/rpc/commands/#library).
+     * Should be used for the UI, and `name` is used to uniquely identify a library. It does not have an ID.
+     */
+    readonly label: string;
+
+    /**
+     * An array of string that should be included into the `ino` file if this library is used.
+     * For example, including `SD` will prepend `#include <SD.h>` to the `ino` file. While including `Bridge`
+     * requires multiple `#include` declarations: `YunClient`, `YunServer`, `Bridge`, etc.
+     */
+    readonly includes: string[];
+    readonly exampleUris: string[];
+    readonly location: LibraryLocation;
+    readonly installDirUri?: string;
+}
+export namespace LibraryPackage {
+
+    export function is(arg: any): arg is LibraryPackage {
+        return ArduinoComponent.is(arg) && 'includes' in arg && Array.isArray(arg['includes']);
+    }
+
+    export function equals(left: LibraryPackage, right: LibraryPackage): boolean {
+        return left.name === right.name && left.author === right.author;
+    }
+
 }

arduino-ide-extension/src/common/protocol/notification-service.ts

@@ -0,0 +1,22 @@
+import { LibraryPackage } from './library-service';
+import { JsonRpcServer } from '@theia/core/lib/common/messaging/proxy-factory';
+import { BoardsPackage, AttachedBoardsChangeEvent } from './boards-service';
+import { Config } from './config-service';
+
+export interface NotificationServiceClient {
+    notifyIndexUpdated(): void;
+    notifyDaemonStarted(): void;
+    notifyDaemonStopped(): void;
+    notifyConfigChanged(event: { config: Config | undefined }): void;
+    notifyPlatformInstalled(event: { item: BoardsPackage }): void;
+    notifyPlatformUninstalled(event: { item: BoardsPackage }): void;
+    notifyLibraryInstalled(event: { item: LibraryPackage }): void;
+    notifyLibraryUninstalled(event: { item: LibraryPackage }): void;
+    notifyAttachedBoardsChanged(event: AttachedBoardsChangeEvent): void;
+}
+
+export const NotificationServicePath = '/services/notification-service';
+export const NotificationServiceServer = Symbol('NotificationServiceServer');
+export interface NotificationServiceServer extends Required<NotificationServiceClient>, JsonRpcServer<NotificationServiceClient> {
+    disposeClient(client: NotificationServiceClient): void;
+}

arduino-ide-extension/src/common/protocol/output-service.ts

@@ -0,0 +1,11 @@
+export interface OutputMessage {
+    readonly name: string;
+    readonly chunk: string;
+    readonly severity?: 'error' | 'warning' | 'info'; // Currently not used!
+}
+
+export const OutputServicePath = '/services/output-service';
+export const OutputService = Symbol('OutputService');
+export interface OutputService {
+    append(message: OutputMessage): void;
+}

arduino-ide-extension/src/common/protocol/sketches-service-client-impl.ts

@@ -1,6 +1,7 @@
 import { inject, injectable } from 'inversify';
+import URI from '@theia/core/lib/common/uri';
 import { notEmpty } from '@theia/core/lib/common/objects';
-import { FileSystem } from '@theia/filesystem/lib/common';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import { Sketch, SketchesService } from '../../common/protocol';
@@ -8,8 +9,8 @@ import { Sketch, SketchesService } from '../../common/protocol';
 @injectable()
 export class SketchesServiceClientImpl {
 
-    @inject(FileSystem)
-    protected readonly fileSystem: FileSystem;
+    @inject(FileService)
+    protected readonly fileService: FileService;
 
     @inject(MessageService)
     protected readonly messageService: MessageService;
@@ -21,7 +22,7 @@ export class SketchesServiceClientImpl {
     protected readonly workspaceService: WorkspaceService;
 
     async currentSketch(): Promise<Sketch | undefined> {
-        const sketches = (await Promise.all(this.workspaceService.tryGetRoots().map(({ uri }) => this.sketchService.getSketchFolder(uri)))).filter(notEmpty);
+        const sketches = (await Promise.all(this.workspaceService.tryGetRoots().map(({ resource }) => this.sketchService.getSketchFolder(resource.toString())))).filter(notEmpty);
         if (!sketches.length) {
             return undefined;
         }
@@ -35,7 +36,7 @@ export class SketchesServiceClientImpl {
         const sketch = await this.currentSketch();
         if (sketch) {
             const uri = sketch.mainFileUri;
-            const exists = await this.fileSystem.exists(uri);
+            const exists = await this.fileService.exists(new URI(uri));
             if (!exists) {
                 this.messageService.warn(`Could not find sketch file: ${uri}`);
                 return undefined;

arduino-ide-extension/src/common/protocol/sketches-service.ts

@@ -22,6 +22,11 @@ export interface SketchesService {
      */
     createNewSketch(): Promise<Sketch>;
 
+    /**
+     * Creates a new sketch with existing content. Rejects if `uri` is not pointing to a valid sketch folder.
+     */
+    cloneExample(uri: string): Promise<Sketch>;
+
     isSketchFolder(uri: string): Promise<boolean>;
 
     /**

arduino-ide-extension/src/common/protocol/tool-output-service.ts

@@ -1,22 +0,0 @@
-import { JsonRpcServer } from '@theia/core';
-
-export interface ToolOutputMessage {
-    readonly tool: string;
-    readonly chunk: string;
-    readonly severity?: 'error' | 'warning' | 'info';
-}
-
-export const ToolOutputServiceServer = Symbol('ToolOutputServiceServer');
-export interface ToolOutputServiceServer extends JsonRpcServer<ToolOutputServiceClient> {
-    append(message: ToolOutputMessage): void;
-    disposeClient(client: ToolOutputServiceClient): void;
-}
-
-export const ToolOutputServiceClient = Symbol('ToolOutputServiceClient');
-export interface ToolOutputServiceClient {
-    onMessageReceived(message: ToolOutputMessage): void;
-}
-
-export namespace ToolOutputService {
-    export const SERVICE_PATH = '/tool-output-service';
-}

arduino-ide-extension/src/common/utils.ts

@@ -7,3 +7,7 @@ export function notEmpty(arg: string | undefined | null): arg is string {
 export function firstToLowerCase(what: string): string {
     return what.charAt(0).toLowerCase() + what.slice(1);
 }
+
+export function firstToUpperCase(what: string): string {
+    return what.charAt(0).toUpperCase() + what.slice(1);
+}

arduino-ide-extension/src/electron-browser/electron-window-service.ts

@@ -0,0 +1,41 @@
+import { inject, injectable, postConstruct } from 'inversify';
+import { remote } from 'electron';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import { ConnectionStatus, ConnectionStatusService } from '@theia/core/lib/browser/connection-status-service';
+import { ElectronWindowService as TheiaElectronWindowService } from '@theia/core/lib/electron-browser/window/electron-window-service';
+import { SplashService } from '../electron-common/splash-service';
+
+@injectable()
+export class ElectronWindowService extends TheiaElectronWindowService {
+
+    @inject(ConnectionStatusService)
+    protected readonly connectionStatusService: ConnectionStatusService;
+
+    @inject(SplashService)
+    protected readonly splashService: SplashService;
+
+    @inject(FrontendApplicationStateService)
+    protected readonly appStateService: FrontendApplicationStateService;
+
+    @postConstruct()
+    protected init(): void {
+        this.appStateService.reachedAnyState('initialized_layout').then(() => this.splashService.requestClose());
+    }
+
+    protected shouldUnload(): boolean {
+        const offline = this.connectionStatusService.currentStatus === ConnectionStatus.OFFLINE;
+        const detail = offline
+            ? 'Could not save the sketch. Please copy your unsaved work into your favorite text editor, and restart the IDE.'
+            : 'Any unsaved changes will not be saved.'
+        const electronWindow = remote.getCurrentWindow();
+        const response = remote.dialog.showMessageBoxSync(electronWindow, {
+            type: 'question',
+            buttons: ['Yes', 'No'],
+            title: 'Confirm',
+            message: 'Are you sure you want to close the sketch?',
+            detail
+        });
+        return response === 0; // 'Yes', close the window.
+    }
+
+}

arduino-ide-extension/src/electron-browser/theia/core/electron-main-menu-factory.ts

@@ -20,13 +20,13 @@ export class ElectronMainMenuFactory extends TheiaElectronMainMenuFactory {
         const { submenu } = super.createOSXMenu();
         const label = 'Arduino Pro IDE';
         if (!!submenu && !(submenu instanceof remote.Menu)) {
-            const [about, , ...rest] = submenu;
-            const menuModel = this.menuProvider.getMenu(ArduinoMenus.FILE__SETTINGS_GROUP);
-            const settings = this.fillMenuTemplate([], menuModel);
+            const [/* about */, /* settings */, ...rest] = submenu;
+            const about = this.fillMenuTemplate([], this.menuProvider.getMenu(ArduinoMenus.HELP__ABOUT_GROUP));
+            const settings = this.fillMenuTemplate([], this.menuProvider.getMenu(ArduinoMenus.FILE__SETTINGS_GROUP));
             return {
                 label,
                 submenu: [
-                    about, // TODO: we have two about dialogs! one from electron the other from Theia.
+                    ...about,
                     { type: 'separator' },
                     ...settings,
                     { type: 'separator' },

arduino-ide-extension/src/electron-browser/theia/core/electron-menu-module.ts

@@ -1,9 +1,13 @@
 import { ContainerModule } from 'inversify';
-import { ElectronMenuContribution as TheiaElectronMenuContribution } from '@theia/core/lib/electron-browser/menu/electron-menu-contribution'
-import { ElectronMenuContribution } from './electron-menu-contribution';
-import { MainMenuManager } from '../../../common/main-menu-manager';
+import { WindowService } from '@theia/core/lib/browser/window/window-service';
 import { ElectronMainMenuFactory as TheiaElectronMainMenuFactory } from '@theia/core/lib/electron-browser/menu/electron-main-menu-factory';
+import { ElectronMenuContribution as TheiaElectronMenuContribution } from '@theia/core/lib/electron-browser/menu/electron-menu-contribution'
+import { ElectronIpcConnectionProvider } from '@theia/core/lib/electron-browser/messaging/electron-ipc-connection-provider';
+import { SplashService, splashServicePath } from '../../../electron-common/splash-service';
+import { MainMenuManager } from '../../../common/main-menu-manager';
+import { ElectronWindowService } from '../../electron-window-service';
 import { ElectronMainMenuFactory } from './electron-main-menu-factory';
+import { ElectronMenuContribution } from './electron-menu-contribution';
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(ElectronMenuContribution).toSelf().inSingletonScope();
@@ -11,4 +15,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     rebind(TheiaElectronMenuContribution).to(ElectronMenuContribution);
     bind(ElectronMainMenuFactory).toSelf().inRequestScope();
     rebind(TheiaElectronMainMenuFactory).toService(ElectronMainMenuFactory);
+    bind(ElectronWindowService).toSelf().inSingletonScope()
+    rebind(WindowService).toService(ElectronWindowService);
+    bind(SplashService).toDynamicValue(context => ElectronIpcConnectionProvider.createProxy(context.container, splashServicePath)).inSingletonScope();
 });

arduino-ide-extension/src/electron-common/splash-service.ts

@@ -0,0 +1,5 @@
+export const splashServicePath = '/services/splash-service';
+export const SplashService = Symbol('SplashService');
+export interface SplashService {
+    requestClose(): Promise<void>;
+}

arduino-ide-extension/src/electron-main/arduino-electron-main-module.ts

@@ -0,0 +1,17 @@
+import { ContainerModule } from 'inversify';
+import { JsonRpcConnectionHandler } from '@theia/core/lib/common/messaging/proxy-factory';
+import { ElectronConnectionHandler } from '@theia/core/lib/electron-common/messaging/electron-connection-handler';
+import { ElectronMainApplication as TheiaElectronMainApplication } from '@theia/core/lib/electron-main/electron-main-application';
+import { SplashService, splashServicePath } from '../electron-common/splash-service';
+import { SplashServiceImpl } from './splash/splash-service-impl';
+import { ElectronMainApplication } from './theia/electron-main-application';
+
+export default new ContainerModule((bind, unbind, isBound, rebind) => {
+    bind(ElectronMainApplication).toSelf().inSingletonScope();
+    rebind(TheiaElectronMainApplication).toService(ElectronMainApplication);
+
+    bind(SplashServiceImpl).toSelf().inSingletonScope();
+    bind(SplashService).toService(SplashServiceImpl);
+    bind(ElectronConnectionHandler).toDynamicValue(context =>
+        new JsonRpcConnectionHandler(splashServicePath, () => context.container.get(SplashService))).inSingletonScope();
+});

arduino-ide-extension/src/electron-main/splash/splash-screen.ts

@@ -0,0 +1,172 @@
+/*
+MIT License
+
+Copyright (c) 2017 Troy McKinnon
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+// Copied from https://raw.githubusercontent.com/trodi/electron-splashscreen/2f5052a133be021cbf9a438d0ef4719cd1796b75/index.ts
+
+/**
+ * Module handles configurable splashscreen to show while app is loading.
+ */
+
+import { Event } from '@theia/core/lib/common/event';
+import { BrowserWindow } from "electron";
+
+/**
+ * When splashscreen was shown.
+ * @ignore
+ */
+let splashScreenTimestamp: number = 0;
+/**
+ * Splashscreen is loaded and ready to show.
+ * @ignore
+ */
+let splashScreenReady = false;
+/**
+ * Main window has been loading for a min amount of time.
+ * @ignore
+ */
+let slowStartup = false;
+/**
+ * True when expected work is complete and we've closed splashscreen, else user prematurely closed splashscreen.
+ * @ignore
+ */
+let done = false;
+/**
+ * Show splashscreen if criteria are met.
+ * @ignore
+ */
+const showSplash = () => {
+    if (splashScreen && splashScreenReady && slowStartup) {
+        splashScreen.show();
+        splashScreenTimestamp = Date.now();
+    }
+};
+/**
+ * Close splashscreen / show main screen. Ensure screen is visible for a min amount of time.
+ * @ignore
+ */
+const closeSplashScreen = (main: Electron.BrowserWindow, min: number): void => {
+    if (splashScreen) {
+        const timeout = min - (Date.now() - splashScreenTimestamp);
+        setTimeout(() => {
+            done = true;
+            if (splashScreen) {
+                splashScreen.isDestroyed() || splashScreen.close(); // Avoid `Error: Object has been destroyed` (#19)
+                splashScreen = null;
+            }
+            if (!main.isDestroyed()) {
+                main.show();
+            }
+        }, timeout);
+    }
+};
+/** `electron-splashscreen` config object. */
+export interface Config {
+    /** Options for the window that is loading and having a splashscreen tied to. */
+    windowOpts: Electron.BrowserWindowConstructorOptions;
+    /**
+     * URL to the splashscreen template. This is the path to an `HTML` or `SVG` file.
+     * If you want to simply show a `PNG`, wrap it in an `HTML` file.
+     */
+    templateUrl: string;
+
+    /**
+     * Full set of browser window options for the splashscreen. We override key attributes to
+     * make it look & feel like a splashscreen; the rest is up to you!
+     */
+    splashScreenOpts: Electron.BrowserWindowConstructorOptions;
+    /** Number of ms the window will load before splashscreen appears (default: 500ms). */
+    delay?: number;
+    /** Minimum ms the splashscreen will be visible (default: 500ms). */
+    minVisible?: number;
+    /** Close window that is loading if splashscreen is closed by user (default: true). */
+    closeWindow?: boolean;
+}
+/**
+ * The actual splashscreen browser window.
+ * @ignore
+ */
+let splashScreen: Electron.BrowserWindow | null;
+/**
+ * Initializes a splashscreen that will show/hide smartly (and handle show/hiding of main window).
+ * @param config - Configures splashscreen
+ * @returns {BrowserWindow} the main browser window ready for loading
+ */
+export const initSplashScreen = (config: Config, onCloseRequested?: Event<void>): BrowserWindow => {
+    const xConfig: Required<Config> = {
+        windowOpts: config.windowOpts,
+        templateUrl: config.templateUrl,
+        splashScreenOpts: config.splashScreenOpts,
+        delay: config.delay ?? 500,
+        minVisible: config.minVisible ?? 500,
+        closeWindow: config.closeWindow ?? true
+    };
+    xConfig.splashScreenOpts.center = true;
+    xConfig.splashScreenOpts.frame = false;
+    xConfig.windowOpts.show = false;
+    const window = new BrowserWindow(xConfig.windowOpts);
+    splashScreen = new BrowserWindow(xConfig.splashScreenOpts);
+    splashScreen.loadURL(`file://${xConfig.templateUrl}`);
+    xConfig.closeWindow && splashScreen.on("close", () => {
+        done || window.close();
+    });
+    // Splashscreen is fully loaded and ready to view.
+    splashScreen.webContents.on("did-finish-load", () => {
+        splashScreenReady = true;
+        showSplash();
+    });
+    // Startup is taking enough time to show a splashscreen.
+    setTimeout(() => {
+        slowStartup = true;
+        showSplash();
+    }, xConfig.delay);
+    if (onCloseRequested) {
+        onCloseRequested(() => closeSplashScreen(window, xConfig.minVisible));
+    } else {
+        window.webContents.on('did-finish-load', () => {
+            closeSplashScreen(window, xConfig.minVisible);
+        });
+    }
+    window.on('closed', () => closeSplashScreen(window, 0)); // XXX: close splash when main window is closed
+    return window;
+};
+/** Return object for `initDynamicSplashScreen()`. */
+export interface DynamicSplashScreen {
+    /** The main browser window ready for loading */
+    main: BrowserWindow;
+    /** The splashscreen browser window so you can communicate with splashscreen in more complex use cases. */
+    splashScreen: Electron.BrowserWindow;
+}
+/**
+ * Initializes a splashscreen that will show/hide smartly (and handle show/hiding of main window).
+ * Use this function if you need to send/receive info to the splashscreen (e.g., you want to send
+ * IPC messages to the splashscreen to inform the user of the app's loading state).
+ * @param config - Configures splashscreen
+ * @returns {DynamicSplashScreen} the main browser window and the created splashscreen
+ */
+export const initDynamicSplashScreen = (config: Config): DynamicSplashScreen => {
+    return {
+        main: initSplashScreen(config),
+        // initSplashScreen initializes splashscreen so this is a safe cast.
+        splashScreen: splashScreen as Electron.BrowserWindow,
+    };
+};

arduino-ide-extension/src/electron-main/splash/splash-service-impl.ts

@@ -0,0 +1,22 @@
+import { injectable } from 'inversify';
+import { Event, Emitter } from '@theia/core/lib/common/event';
+import { SplashService } from '../../electron-common/splash-service';
+
+@injectable()
+export class SplashServiceImpl implements SplashService {
+
+    protected requested = false;
+    protected readonly onCloseRequestedEmitter = new Emitter<void>();
+
+    get onCloseRequested(): Event<void> {
+        return this.onCloseRequestedEmitter.event;
+    }
+
+    async requestClose(): Promise<void> {
+        if (!this.requested) {
+            this.requested = true;
+            this.onCloseRequestedEmitter.fire()
+        }
+    }
+
+}