close websocket connection after closing serial plotter

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.eslintrc.js

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

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,74 @@
+name: Bug report
+description: Report a problem with the code or documentation in this repository.
+labels:
+  - "type: imperfection"
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the problem
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: To reproduce
+      description: Provide the specific set of steps we can follow to reproduce the problem.
+    validations:
+      required: true
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      description: What would you expect to happen after following those instructions?
+    validations:
+      required: true
+  - type: input
+    id: project-version
+    attributes:
+      label: Arduino IDE version
+      description: |
+        Which version of the Arduino IDE are you using?
+        See **Help > About Arduino IDE** in the Arduino IDE menus (**Arduino IDE > About Arduino IDE** on macOS).
+        This should be the latest [nightly build](https://www.arduino.cc/en/software#nightly-builds).
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: Operating system
+      description: Which operating system(s) are you using on your computer?
+      multiple: true
+      options:
+        - Windows
+        - Linux
+        - macOS
+        - N/A
+    validations:
+      required: true
+  - type: input
+    id: os-version
+    attributes:
+      label: Operating system version
+      description: Which version of the operating system are you using on your computer?
+    validations:
+      required: true
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional context
+      description: Add any additional information here.
+    validations:
+      required: false
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Issue checklist
+      description: Please double-check that you have done each of the following things before submitting the issue.
+      options:
+        - label: I searched for previous reports in [the issue tracker](https://github.com/arduino/arduino-ide/issues?q=)
+          required: true
+        - label: I verified the problem still occurs when using the latest [nightly build](https://www.arduino.cc/en/software#nightly-builds)
+          required: true
+        - label: My report contains all necessary details
+          required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,19 @@
+# Source:
+# https://github.com/arduino/tooling-project-assets/blob/main/issue-templates/template-choosers/general/config.yml
+blank_issues_enabled: false
+contact_links:
+  - name: Learn about using this project
+    url: https://github.com/arduino/arduino-ide#readme
+    about: Detailed usage documentation is available here.
+  - name: Support request
+    url: https://forum.arduino.cc/
+    about: We can help you out on the Arduino Forum!
+  - name: Issue report guide
+    url: https://github.com/arduino/arduino-ide/blob/main/docs/contributor-guide/issues.md#issue-report-guide
+    about: Learn about submitting issue reports to this repository.
+  - name: Contributor guide
+    url: https://github.com/arduino/arduino-ide/blob/main/docs/CONTRIBUTING.md#contributor-guide
+    about: Learn about contributing to this project.
+  - name: Discuss development work on the project
+    url: https://groups.google.com/a/arduino.cc/g/developers
+    about: Arduino Developers Mailing List

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,69 @@
+name: Feature request
+description: Suggest an enhancement to this project.
+labels:
+  - "type: enhancement"
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the request
+    validations:
+      required: true
+  - type: textarea
+    id: current
+    attributes:
+      label: Describe the current behavior
+      description: |
+        What is the current behavior of the Arduino IDE in relation to your request?
+        How can we reproduce that behavior?
+    validations:
+      required: true
+  - type: input
+    id: project-version
+    attributes:
+      label: Arduino IDE version
+      description: |
+        Which version of the Arduino IDE are you using?
+        See **Help > About Arduino IDE** in the Arduino IDE menus (**Arduino IDE > About Arduino IDE** on macOS).
+        This should be the latest [nightly build](https://www.arduino.cc/en/software#nightly-builds).
+    validations:
+      required: true
+  - type: dropdown
+    id: os
+    attributes:
+      label: Operating system
+      description: Which operating system(s) are you using on your computer?
+      multiple: true
+      options:
+        - Windows
+        - Linux
+        - macOS
+        - N/A
+    validations:
+      required: true
+  - type: input
+    id: os-version
+    attributes:
+      label: Operating system version
+      description: Which version of the operating system are you using on your computer?
+    validations:
+      required: true
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional context
+      description: Add any additional information here.
+    validations:
+      required: false
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Issue checklist
+      description: Please double-check that you have done each of the following things before submitting the issue.
+      options:
+        - label: I searched for previous requests in [the issue tracker](https://github.com/arduino/arduino-ide/issues?q=)
+          required: true
+        - label: I verified the feature was still missing when using the latest [nightly build](https://www.arduino.cc/en/software#nightly-builds)
+          required: true
+        - label: My request contains all necessary details
+          required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+### Motivation
+<!-- Why this pull request? -->
+
+### Change description
+<!-- What does your code do? -->
+
+### Other information
+<!-- Any additional information that could help the review process -->
+
+### Reviewer checklist
+
+* [ ] PR addresses a single concern.
+* [ ] The PR has no duplicates (please search among the [Pull Requests](https://github.com/arduino/arduino-ide/pulls) before creating one)
+* [ ] PR title and description are properly filled.
+* [ ] Docs have been added / updated (for bug fixes / features)

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# See: https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#about-the-dependabotyml-file
+version: 2
+
+updates:
+  # Configure check for outdated GitHub Actions actions in workflows.
+  # Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/dependabot/README.md
+  # See: https://docs.github.com/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
+  - package-ecosystem: github-actions
+    directory: / # Check the repository's workflows under /.github/workflows/
+    assignees:
+      - per1234
+    schedule:
+      interval: daily
+    labels:
+      - "topic: infrastructure"

.github/label-configuration-files/labels.yml

@@ -0,0 +1,24 @@
+# Used by the "Sync Labels" workflow
+# See: https://github.com/Financial-Times/github-label-sync#label-config-file
+
+- name: "topic: accessibility"
+  color: "00ffff"
+  description: Enabling the use of the software by everyone
+- name: "topic: CLI"
+  color: "00ffff"
+  description: Related to Arduino CLI
+- name: "topic: debugger"
+  color: "00ffff"
+  description: Related to the integrated debugger
+- name: "topic: language server"
+  color: "00ffff"
+  description: Related to the Arduino Language Server
+- name: "topic: serial monitor"
+  color: "00ffff"
+  description: Related to the Serial Monitor
+- name: "topic: theia"
+  color: "00ffff"
+  description: Related to the Theia IDE framework
+- name: "topic: theme"
+  color: "00ffff"
+  description: Related to GUI theming

.github/workflows/build.yml

@@ -1,82 +1,156 @@
-name: Arduino Pro IDE
+name: Arduino IDE
 
 on:
   push:
     branches:
-      - master
+      - main
+    paths-ignore:
+      - '.github/**'
+      - '!.github/workflows/build.yml'
+      - '.vscode/**'
+      - 'docs/**'
+      - 'scripts/**'
+      - 'static/**'
+      - '*.md'
     tags:
       - '[0-9]+.[0-9]+.[0-9]+*'
   workflow_dispatch:
   pull_request:
-    branches:
-      - master
+    paths-ignore:
+      - '.github/**'
+      - '!.github/workflows/build.yml'
+      - '.vscode/**'
+      - 'docs/**'
+      - 'scripts/**'
+      - 'static/**'
+      - '*.md'
   schedule:
     - cron: '0 3 * * *' # run every day at 3AM (https://docs.github.com/en/actions/reference/events-that-trigger-workflows#scheduled-events-schedule)
 
-jobs:
+env:
+  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
+  GO_VERSION: "1.17"
+  JOB_TRANSFER_ARTIFACT: build-artifacts
+  CHANGELOG_ARTIFACTS: changelog
 
+jobs:
   build:
+    name: build (${{ matrix.config.os }})
     strategy:
       matrix:
         config:
-          - os: windows-2016
-          - os: ubuntu-latest
+          - os: windows-2019
+            certificate-secret: WINDOWS_SIGNING_CERTIFICATE_PFX # Name of the secret that contains the certificate.
+            certificate-password-secret: WINDOWS_SIGNING_CERTIFICATE_PASSWORD # Name of the secret that contains the certificate password.
+            certificate-extension: pfx  # File extension for the certificate.
+          - os: ubuntu-18.04 # https://github.com/arduino/arduino-ide/issues/259
           - os: macos-latest
-          # - os: rsora-rpi-arm # self-hosted armhf
+            # 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
+            certificate-secret: APPLE_SIGNING_CERTIFICATE_P12
+            certificate-password-secret: KEYCHAIN_PASSWORD
+            certificate-extension: p12
     runs-on: ${{ matrix.config.os }}
     timeout-minutes: 90
-    env:
-      CERTIFICATE_PATH: /tmp/macos_signing_certificate.p12
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - name: Install Node.js 10.x
-        uses: actions/setup-node@v1
+      - name: Install Node.js 16.x
+        uses: actions/setup-node@v3
         with:
-          node-version: '10.x'
+          node-version: '16.x'
           registry-url: 'https://registry.npmjs.org'
 
-      - name: Install Python 2.7
-        uses: actions/setup-python@v2
+      - name: Install Python 3.x
+        uses: actions/setup-python@v4
         with:
-          python-version: '2.7'
+          python-version: '3.x'
 
-      - 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: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Install Taskfile
+        uses: arduino/setup-task@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          version: 3.x
 
       - name: Package
         shell: bash
         env:
-          PUPPETEER_SKIP_CHROMIUM_DOWNLOAD: true
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           AC_USERNAME: ${{ secrets.AC_USERNAME }}
           AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
+          AC_TEAM_ID: ${{ secrets.AC_TEAM_ID }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          IS_NIGHTLY: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master') }}
+          IS_NIGHTLY: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') }}
           IS_RELEASE: ${{ startsWith(github.ref, 'refs/tags/') }}
+          CAN_SIGN: ${{ secrets[matrix.config.certificate-secret] != '' }}
         run: |
-            # electron-builder will try to sign during the Windows job if these environment variables are defined
-            if [ "${{ runner.OS }}" = "macOS" ]; then
-              # See: https://www.electron.build/code-signing
-              export CSC_LINK="${{ env.CERTIFICATE_PATH }}"
-              export CSC_KEY_PASSWORD="${{ secrets.KEYCHAIN_PASSWORD }}"
-            fi
-            yarn --cwd ./electron/packager/
-            yarn --cwd ./electron/packager/ package
+          # See: https://www.electron.build/code-signing
+          if [ $CAN_SIGN = false ]; then
+            echo "Skipping the app signing: certificate not provided."
+          else
+            export CSC_LINK="${{ runner.temp }}/signing_certificate.${{ matrix.config.certificate-extension }}"
+            echo "${{ secrets[matrix.config.certificate-secret] }}" | base64 --decode > "$CSC_LINK"
+            export CSC_KEY_PASSWORD="${{ secrets[matrix.config.certificate-password-secret] }}"
+          fi
+
+          if [ "${{ runner.OS }}" = "Windows" ]; then
+            npm config set msvs_version 2017 --global
+          fi
+          npx node-gyp install
+          yarn --cwd ./electron/packager/
+          yarn --cwd ./electron/packager/ package
 
       - name: Upload [GitHub Actions]
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
-          name: build-artifacts
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
           path: electron/build/dist/build-artifacts/
 
+  artifacts:
+    name: ${{ matrix.artifact.name }} artifact
+    needs: build
+    if: always() && needs.build.result != 'skipped'
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        artifact:
+          - path: '*Linux_64bit.zip'
+            name: Linux_X86-64_zip
+          - path: '*Linux_64bit.AppImage'
+            name: Linux_X86-64_app_image
+          - path: '*macOS_64bit.dmg'
+            name: macOS_dmg
+          - path: '*macOS_64bit.zip'
+            name: macOS_zip
+          - path: '*Windows_64bit.exe'
+            name: Windows_X86-64_interactive_installer
+          - path: '*Windows_64bit.msi'
+            name: Windows_X86-64_MSI
+          - path: '*Windows_64bit.zip'
+            name: Windows_X86-64_zip
+
+    steps:
+      - name: Download job transfer artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          path: ${{ env.JOB_TRANSFER_ARTIFACT }}
+
+      - name: Upload tester build artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ matrix.artifact.name }}
+          path: ${{ env.JOB_TRANSFER_ARTIFACT }}/${{ matrix.artifact.path }}
+
   changelog:
     needs: build
     runs-on: ubuntu-latest
@@ -84,7 +158,7 @@ jobs:
       BODY: ${{ steps.changelog.outputs.BODY }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0 # To fetch all history for all branches and tags.
 
@@ -93,49 +167,49 @@ jobs:
         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
+          export LATEST_TAG=$(git describe --abbrev=0)
+          export GIT_LOG=$(git log --pretty=" - %s [%h]" $LATEST_TAG..HEAD | sed 's/ *$//g')
+          if [ "$IS_RELEASE" = true ]; then
+            export BODY=$(echo -e "$GIT_LOG")
+          else
+            export LATEST_TAG_WITH_LINK=$(echo "[$LATEST_TAG](https://github.com/arduino/arduino-ide/releases/tag/$LATEST_TAG)")
+            if [ -z "$GIT_LOG" ]; then
+                export BODY="There were no changes since version $LATEST_TAG_WITH_LINK."
+            else
+                export BODY=$(echo -e "Changes since version $LATEST_TAG_WITH_LINK:\n$GIT_LOG")
             fi
-            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
+          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 "BODY=$OUTPUT_SAFE_BODY" >> $GITHUB_OUTPUT
+          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
+        if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main')
+        uses: actions/upload-artifact@v3
         with:
-          name: build-artifacts
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
           path: CHANGELOG.txt
 
   publish:
     needs: changelog
-    if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master')
+    if: github.repository == 'arduino/arduino-ide' && (github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main'))
     runs-on: ubuntu-latest
     steps:
       - name: Download [GitHub Actions]
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
-          name: build-artifacts
-          path: build-artifacts
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          path: ${{ env.JOB_TRANSFER_ARTIFACT }}
 
       - name: Publish Nightly [S3]
         uses: docker://plugins/s3
         env:
-          PLUGIN_SOURCE: "build-artifacts/*"
-          PLUGIN_STRIP_PREFIX: "build-artifacts/"
-          PLUGIN_TARGET: "/arduino-pro-ide/nightly"
+          PLUGIN_SOURCE: '${{ env.JOB_TRANSFER_ARTIFACT }}/*'
+          PLUGIN_STRIP_PREFIX: '${{ env.JOB_TRANSFER_ARTIFACT }}/'
+          PLUGIN_TARGET: '/arduino-ide/nightly'
           PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -146,33 +220,49 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download [GitHub Actions]
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
-          name: build-artifacts
-          path: build-artifacts
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          path: ${{ env.JOB_TRANSFER_ARTIFACT }}
 
       - name: Get Tag
         id: tag_name
         run: |
-          echo ::set-output name=TAG_NAME::${GITHUB_REF#refs/tags/}
+          echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
       - name: Publish Release [GitHub]
-        uses: kittaakos/upload-release-action@dev
+        uses: svenstaro/upload-release-action@2.3.0
         with:
-          repo_token: ${{ secrets.RELEASE_TOKEN }}
-          repo_name: arduino/arduino-pro-ide
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
           release_name: ${{ steps.tag_name.outputs.TAG_NAME }}
-          file: build-artifacts/*
+          file: ${{ env.JOB_TRANSFER_ARTIFACT }}/*
           tag: ${{ github.ref }}
           file_glob: true
           body: ${{ needs.changelog.outputs.BODY }}
 
       - name: Publish Release [S3]
+        if: github.repository == 'arduino/arduino-ide'
         uses: docker://plugins/s3
         env:
-          PLUGIN_SOURCE: "build-artifacts/*"
-          PLUGIN_STRIP_PREFIX: "build-artifacts/"
-          PLUGIN_TARGET: "/arduino-pro-ide"
+          PLUGIN_SOURCE: '${{ env.JOB_TRANSFER_ARTIFACT }}/*'
+          PLUGIN_STRIP_PREFIX: '${{ env.JOB_TRANSFER_ARTIFACT }}/'
+          PLUGIN_TARGET: '/arduino-ide'
           PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+
+  clean:
+    # This job must run after all jobs that use the transfer artifact.
+    needs:
+      - build
+      - publish
+      - release
+      - artifacts
+    if: always() && needs.build.result != 'skipped'
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Remove unneeded job transfer artifact
+        uses: geekyeggo/delete-artifact@v2
+        with:
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}

.github/workflows/check-certificates.yml

@@ -0,0 +1,132 @@
+# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/check-certificates.md
+name: Check Certificates
+
+# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
+on:
+  push:
+    paths:
+      - '.github/workflows/check-certificates.ya?ml'
+  pull_request:
+    paths:
+      - '.github/workflows/check-certificates.ya?ml'
+  schedule:
+    # Run every 10 hours.
+    - cron: '0 */10 * * *'
+  workflow_dispatch:
+  repository_dispatch:
+
+env:
+  # Begin notifications when there are less than this many days remaining before expiration.
+  EXPIRATION_WARNING_PERIOD: 30
+
+jobs:
+  check-certificates:
+    name: ${{ matrix.certificate.identifier }}
+    # Only run when the workflow will have access to the certificate secrets.
+    if: >
+      (github.event_name != 'pull_request' && github.repository == 'arduino/arduino-ide') ||
+      (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'arduino/arduino-ide')
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+
+      matrix:
+        certificate:
+          # Additional certificate definitions can be added to this list.
+          - identifier: macOS signing certificate # Text used to identify certificate in notifications.
+            certificate-secret: APPLE_SIGNING_CERTIFICATE_P12 # Name of the secret that contains the certificate.
+            password-secret: KEYCHAIN_PASSWORD # 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/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
+          )
+
+      - name: Slack notification of certificate verification failure
+        if: failure()
+        env:
+          SLACK_WEBHOOK: ${{ secrets.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
+        uses: rtCamp/action-slack-notify@v2
+
+      - 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 "days=$DAYS_BEFORE_EXPIRATION" >> $GITHUB_OUTPUT
+
+      - 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'
+        env:
+          SLACK_WEBHOOK: ${{ secrets.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
+        uses: rtCamp/action-slack-notify@v2

.github/workflows/check-i18n-task.yml

@@ -0,0 +1,53 @@
+name: Check Internationalization
+
+env:
+  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
+  GO_VERSION: "1.17"
+
+# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
+on:
+  push:
+    paths:
+      - '.github/workflows/check-i18n-task.ya?ml'
+      - '**/package.json'
+      - '**.ts'
+      - 'i18n/**'
+  pull_request:
+    paths:
+      - '.github/workflows/check-i18n-task.ya?ml'
+      - '**/package.json'
+      - '**.ts'
+      - 'i18n/**'
+  workflow_dispatch:
+  repository_dispatch:
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Install Node.js 16.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16.x'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Install Taskfile
+        uses: arduino/setup-task@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          version: 3.x
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Check for errors
+        run: yarn i18n:check

.github/workflows/compose-full-changelog.yml

@@ -0,0 +1,55 @@
+name: Compose full changelog
+
+on:
+  release:
+    types:
+      - edited
+
+env:
+  CHANGELOG_ARTIFACTS: changelog
+  # See: https://github.com/actions/setup-node/#readme
+  NODE_VERSION: 16.x
+
+jobs:
+  create-changelog:
+    if: github.repository == 'arduino/arduino-ide'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Get Tag
+        id: tag_name
+        run: |
+          echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+
+      - name: Create full changelog
+        id: full-changelog
+        run: |
+          yarn add @octokit/rest --ignore-workspace-root-check
+          mkdir "${{ github.workspace }}/${{ env.CHANGELOG_ARTIFACTS }}"
+
+          # Get the changelog file name to build
+          CHANGELOG_FILE_NAME="${{ steps.tag_name.outputs.TAG_NAME }}-$(date +%s).md"
+
+          # Create manifest file pointing to latest changelog file name
+          echo "$CHANGELOG_FILE_NAME" >> "${{ github.workspace }}/${{ env.CHANGELOG_ARTIFACTS }}/latest.txt"
+
+          # Compose changelog
+          yarn run compose-changelog "${{ github.workspace }}/${{ env.CHANGELOG_ARTIFACTS }}/$CHANGELOG_FILE_NAME"
+
+      - name: Publish Changelog [S3]
+        uses: docker://plugins/s3
+        env:
+          PLUGIN_SOURCE: '${{ env.CHANGELOG_ARTIFACTS }}/*'
+          PLUGIN_STRIP_PREFIX: '${{ env.CHANGELOG_ARTIFACTS }}/'
+          PLUGIN_TARGET: '/arduino-ide/changelog'
+          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/i18n-nightly-push.yml

@@ -0,0 +1,45 @@
+name: i18n-nightly-push
+
+env:
+  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
+  GO_VERSION: "1.17"
+
+on:
+  schedule:
+    # run every day at 1AM
+    - cron: '0 1 * * *'
+
+jobs:
+  push-to-transifex:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Node.js 16.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16.x'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Install Task
+        uses: arduino/setup-task@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          version: 3.x
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Run i18n:push script
+        run: yarn run i18n:push
+        env:
+          TRANSIFEX_ORGANIZATION: ${{ secrets.TRANSIFEX_ORGANIZATION }}
+          TRANSIFEX_PROJECT: ${{ secrets.TRANSIFEX_PROJECT }}
+          TRANSIFEX_RESOURCE: ${{ secrets.TRANSIFEX_RESOURCE }}
+          TRANSIFEX_API_KEY: ${{ secrets.TRANSIFEX_API_KEY }}

.github/workflows/i18n-weekly-pull.yml

@@ -0,0 +1,53 @@
+name: i18n-weekly-pull
+
+env:
+  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
+  GO_VERSION: "1.17"
+
+on:
+  schedule:
+    # run every monday at 2AM
+    - cron: '0 2 * * 1'
+
+jobs:
+  pull-from-transifex:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Node.js 16.x
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16.x'
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Install Task
+        uses: arduino/setup-task@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          version: 3.x
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Run i18n:pull script
+        run: yarn run i18n:pull
+        env:
+          TRANSIFEX_ORGANIZATION: ${{ secrets.TRANSIFEX_ORGANIZATION }}
+          TRANSIFEX_PROJECT: ${{ secrets.TRANSIFEX_PROJECT }}
+          TRANSIFEX_RESOURCE: ${{ secrets.TRANSIFEX_RESOURCE }}
+          TRANSIFEX_API_KEY: ${{ secrets.TRANSIFEX_API_KEY }}
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v4
+        with:
+          commit-message: Updated translation files
+          title: Update translation files
+          branch: i18n/translations-update
+          author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.github/workflows/sync-labels.yml

@@ -0,0 +1,139 @@
+# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/sync-labels.md
+name: Sync Labels
+
+# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
+on:
+  push:
+    paths:
+      - ".github/workflows/sync-labels.ya?ml"
+      - ".github/label-configuration-files/*.ya?ml"
+  pull_request:
+    paths:
+      - ".github/workflows/sync-labels.ya?ml"
+      - ".github/label-configuration-files/*.ya?ml"
+  schedule:
+    # Run daily at 8 AM UTC to sync with changes to shared label configurations.
+    - cron: "0 8 * * *"
+  workflow_dispatch:
+  repository_dispatch:
+
+env:
+  CONFIGURATIONS_FOLDER: .github/label-configuration-files
+  CONFIGURATIONS_ARTIFACT: label-configuration-files
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Download JSON schema for labels configuration file
+        id: download-schema
+        uses: carlosperate/download-file-action@v2
+        with:
+          file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/arduino-tooling-gh-label-configuration-schema.json
+          location: ${{ runner.temp }}/label-configuration-schema
+
+      - name: Install JSON schema validator
+        run: |
+          sudo npm install \
+            --global \
+            ajv-cli \
+            ajv-formats
+
+      - name: Validate local labels configuration
+        run: |
+          # See: https://github.com/ajv-validator/ajv-cli#readme
+          ajv validate \
+            --all-errors \
+            -c ajv-formats \
+            -s "${{ steps.download-schema.outputs.file-path }}" \
+            -d "${{ env.CONFIGURATIONS_FOLDER }}/*.{yml,yaml}"
+
+  download:
+    needs: check
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        filename:
+          # Filenames of the shared configurations to apply to the repository in addition to the local configuration.
+          # https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/sync-labels
+          - universal.yml
+          - tooling.yml
+
+    steps:
+      - name: Download
+        uses: carlosperate/download-file-action@v2
+        with:
+          file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}
+
+      - name: Pass configuration files to next job via workflow artifact
+        uses: actions/upload-artifact@v3
+        with:
+          path: |
+            *.yaml
+            *.yml
+          if-no-files-found: error
+          name: ${{ env.CONFIGURATIONS_ARTIFACT }}
+
+  sync:
+    needs: download
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set environment variables
+        run: |
+          # See: https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
+          echo "MERGED_CONFIGURATION_PATH=${{ runner.temp }}/labels.yml" >> "$GITHUB_ENV"
+
+      - name: Determine whether to dry run
+        id: dry-run
+        if: >
+          github.event_name == 'pull_request' ||
+          (
+            (
+              github.event_name == 'push' ||
+              github.event_name == 'workflow_dispatch'
+            ) &&
+            github.ref != format('refs/heads/{0}', github.event.repository.default_branch)
+          )
+        run: |
+          # Use of this flag in the github-label-sync command will cause it to only check the validity of the
+          # configuration.
+          echo "flag=--dry-run" >> $GITHUB_OUTPUT
+
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Download configuration files artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: ${{ env.CONFIGURATIONS_ARTIFACT }}
+          path: ${{ env.CONFIGURATIONS_FOLDER }}
+
+      - name: Remove unneeded artifact
+        uses: geekyeggo/delete-artifact@v2
+        with:
+          name: ${{ env.CONFIGURATIONS_ARTIFACT }}
+
+      - name: Merge label configuration files
+        run: |
+          # Merge all configuration files
+          shopt -s extglob
+          cat "${{ env.CONFIGURATIONS_FOLDER }}"/*.@(yml|yaml) > "${{ env.MERGED_CONFIGURATION_PATH }}"
+
+      - name: Install github-label-sync
+        run: sudo npm install --global github-label-sync
+
+      - name: Sync labels
+        env:
+          GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # See: https://github.com/Financial-Times/github-label-sync
+          github-label-sync \
+            --labels "${{ env.MERGED_CONFIGURATION_PATH }}" \
+            ${{ steps.dry-run.outputs.flag }} \
+            ${{ github.repository }}

.github/workflows/themes-weekly-pull.yml

@@ -0,0 +1,62 @@
+name: themes-weekly-pull
+
+on:
+  schedule:
+    # run every friday at 5AM
+    - cron: '0 5 * * 5'
+  workflow_dispatch:
+
+env:
+  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
+  GO_VERSION: "1.17"
+  NODE_VERSION: 16.x
+
+jobs:
+  pull-from-jsonbin:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          registry-url: 'https://registry.npmjs.org'
+
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Install Task
+        uses: arduino/setup-task@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          version: 3.x
+
+      - name: Install dependencies
+        run: yarn
+
+      - name: Run themes:pull script
+        run: yarn run themes:pull
+        env:
+          JSONBIN_MASTER_KEY: ${{ secrets.JSONBIN_MASTER_KEY }}
+          JSONBIN_ID: ${{ secrets.JSONBIN_ID }}
+
+      - name: Generate dark tokens
+        run: npx token-transformer scripts/themes/tokens/arduino-tokens.json scripts/themes/tokens/dark.json core,ide-default,ide-dark,theia core,ide-default,ide-dark
+
+      - name: Generate default tokens
+        run: npx token-transformer scripts/themes/tokens/arduino-tokens.json scripts/themes/tokens/default.json core,ide-default,theia core,ide-default
+
+      - name: Run themes:generate script
+        run: yarn run themes:generate
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v4
+        with:
+          commit-message: Updated themes
+          title: Update themes
+          branch: themes/themes-update
+          author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.gitignore

@@ -7,7 +7,8 @@ build/
 Examples/
 !electron/build/
 src-gen/
-*webpack.config.js
+!webpack.config.js
+gen-webpack.config.js
 .DS_Store
 # switching from `electron` to `browser` in dev mode.
 .browser_modules
@@ -16,3 +17,9 @@ yarn*.log
 plugins
 # the config files for the CLI
 arduino-ide-extension/data/cli/config
+# the tokens folder for the themes
+scripts/themes/tokens
+# environment variables
+.env
+# content trace files for electron
+electron-app/traces

.gitpod.yml

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

.prettierrc

@@ -0,0 +1,7 @@
+{
+	"singleQuote": true,
+	"tabWidth": 2,
+	"useTabs": false,
+	"printWidth": 80,
+	"endOfLine": "auto"
+}

.vscode/launch.json

@@ -1,9 +1,107 @@
 {
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "App (Electron) [Dev]",
+      "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
+      "windows": {
+        "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd",
+      },
+      "cwd": "${workspaceFolder}/electron-app",
+      "args": [
+        ".",
+        "--log-level=debug",
+        "--hostname=localhost",
+        "--no-cluster",
+        "--app-project-path=${workspaceRoot}/electron-app",
+        "--remote-debugging-port=9222",
+        "--no-app-auto-install",
+        "--plugins=local-dir:../plugins",
+        "--hosted-plugin-inspect=9339",
+        "--content-trace",
+        "--open-devtools"
+      ],
+      "env": {
+        "NODE_ENV": "development"
+      },
+      "sourceMaps": true,
+      "outFiles": [
+        "${workspaceRoot}/electron-app/src-gen/backend/*.js",
+        "${workspaceRoot}/electron-app/src-gen/frontend/*.js",
+        "${workspaceRoot}/electron-app/lib/**/*.js",
+        "${workspaceRoot}/arduino-ide-extension/lib/**/*.js",
+        "${workspaceRoot}/node_modules/@theia/**/*.js"
+      ],
+      "smartStep": true,
+      "internalConsoleOptions": "openOnSessionStart",
+      "outputCapture": "std"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "App (Electron)",
+      "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
+      "windows": {
+        "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd",
+      },
+      "cwd": "${workspaceFolder}/electron-app",
+      "args": [
+        ".",
+        "--log-level=debug",
+        "--hostname=localhost",
+        "--no-cluster",
+        "--app-project-path=${workspaceRoot}/electron-app",
+        "--remote-debugging-port=9222",
+        "--no-app-auto-install",
+        "--plugins=local-dir:../plugins",
+        "--hosted-plugin-inspect=9339"
+      ],
+      "env": {
+        "NODE_ENV": "development"
+      },
+      "sourceMaps": true,
+      "outFiles": [
+        "${workspaceRoot}/electron-app/src-gen/backend/*.js",
+        "${workspaceRoot}/electron-app/src-gen/frontend/*.js",
+        "${workspaceRoot}/electron-app/lib/**/*.js",
+        "${workspaceRoot}/arduino-ide-extension/lib/**/*.js",
+        "${workspaceRoot}/node_modules/@theia/**/*.js"
+      ],
+      "smartStep": true,
+      "internalConsoleOptions": "openOnSessionStart",
+      "outputCapture": "std"
+    },
+    {
+      "type": "chrome",
+      "request": "attach",
+      "name": "Attach to Electron Frontend",
+      "port": 9222,
+      "webRoot": "${workspaceFolder}/electron-app"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Run Test [current]",
+      "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+      "args": [
+        "--require",
+        "reflect-metadata/Reflect",
+        "--require",
+        "ignore-styles",
+        "--no-timeouts",
+        "--colors",
+        "**/${fileBasenameNoExtension}.js"
+      ],
+      "env": {
+        "TS_NODE_PROJECT": "${workspaceRoot}/tsconfig.json"
+      },
+      "sourceMaps": true,
+      "smartStep": true,
+      "internalConsoleOptions": "openOnSessionStart",
+      "outputCapture": "std"
+    },
     {
       "type": "node",
       "request": "attach",
@@ -16,94 +114,15 @@
       "name": "Electron Packager",
       "program": "${workspaceRoot}/electron/packager/index.js",
       "cwd": "${workspaceFolder}/electron/packager"
-    },
+    }
+  ],
+  "compounds": [
     {
-      "type": "node",
-      "request": "launch",
-      "name": "App (Electron)",
-      "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
-      "windows": {
-        "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd",
-        "env": {
-          "NODE_ENV": "development",
-          "NODE_PRESERVE_SYMLINKS": "1"
-        }
-      },
-      "program": "${workspaceRoot}/electron-app/src-gen/frontend/electron-main.js",
-      "protocol": "inspector",
-      "args": [
-        "--log-level=debug",
-        "--hostname=localhost",
-        "--no-cluster",
-        "--remote-debugging-port=9222",
-        "--no-app-auto-install",
-        "--plugins=local-dir:plugins"
-      ],
-      "env": {
-        "NODE_ENV": "development"
-      },
-      "sourceMaps": true,
-      "outFiles": [
-        "${workspaceRoot}/electron-app/src-gen/backend/*.js",
-        "${workspaceRoot}/electron-app/src-gen/frontend/*.js",
-        "${workspaceRoot}/electron-app/lib/**/*.js",
-        "${workspaceRoot}/arduino-ide-extension/lib/**/*.js"
-      ],
-      "smartStep": true,
-      "internalConsoleOptions": "openOnSessionStart",
-      "outputCapture": "std"
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "App (Browser)",
-      "program": "${workspaceRoot}/browser-app/src-gen/backend/main.js",
-      "args": [
-        "--hostname=0.0.0.0",
-        "--port=3000",
-        "--no-cluster",
-        "--no-app-auto-install",
-        "--plugins=local-dir:plugins"
-      ],
-      "windows": {
-        "env": {
-          "NODE_ENV": "development",
-          "NODE_PRESERVE_SYMLINKS": "1"
-        }
-      },
-      "env": {
-        "NODE_ENV": "development"
-      },
-      "sourceMaps": true,
-      "outFiles": [
-        "${workspaceRoot}/browser-app/src-gen/backend/*.js",
-        "${workspaceRoot}/browser-app/lib/**/*.js",
-        "${workspaceRoot}/arduino-ide-extension/lib/**/*.js"
-      ],
-      "smartStep": true,
-      "internalConsoleOptions": "openOnSessionStart",
-      "outputCapture": "std"
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "protocol": "inspector",
-      "name": "Run Test [current]",
-      "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
-      "args": [
-        "--require",
-        "reflect-metadata/Reflect",
-        "--no-timeouts",
-        "--colors",
-        "**/${fileBasenameNoExtension}.js"
-      ],
-      "env": {
-        "TS_NODE_PROJECT": "${workspaceRoot}/tsconfig.json"
-      },
-      "sourceMaps": true,
-      "smartStep": true,
-      "internalConsoleOptions": "openOnSessionStart",
-      "outputCapture": "std"
+      "name": "Launch Electron Backend & Frontend",
+      "configurations": [
+        "App (Electron)",
+        "Attach to Electron Frontend"
+      ]
     }
   ]
 }

.vscode/settings.json

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

.vscode/tasks.json

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

BUILDING.md

@@ -0,0 +1,3 @@
+# Development Guide
+
+This documentation has been moved [**here**](docs/development.md#development-guide).

Dockerfile

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

LICENSE.txt

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

README.md

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

arduino-debugger-extension/package.json

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

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

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

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

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

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

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

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

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

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

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

arduino-debugger-extension/src/browser/style/debug-dark.svg

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

arduino-debugger-extension/tsconfig.json

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

arduino-debugger-extension/tslint.json

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

arduino-ide-extension/README.md

@@ -1,6 +1,6 @@
 ## Arduino IDE Extension
 
-Arduino Pro IDE is based on Theia, and most of its IDE features, UIs and customizations are implemented in this Theia extension.
+Arduino IDE is based on Theia, and most of its IDE features, UIs and customizations are implemented in this Theia extension.
 
 ### IDE Services
 
@@ -30,17 +30,20 @@ The Core Service is responsible for building your sketches and uploading them to
   - compiling a sketch for a selected board type
   - uploading a sketch to a connected board
 
-#### Monitor Service
+#### Serial Service
 
-The Monitor Service allows getting information back from sketches running on your Arduino boards.
+The Serial Service allows getting information back from sketches running on your Arduino boards.
 
-- [src/common/protocol/monitor-service.ts](./src/common/protocol/monitor-service.ts) implements the common classes and interfaces
-- [src/node/monitor-service-impl.ts](./src/node/monitor-service-impl.ts) implements the service backend:
+- [src/common/protocol/serial-service.ts](./src/common/protocol/serial-service.ts) implements the common classes and interfaces
+- [src/node/serial/serial-service-impl.ts](./src/node/serial/serial-service-impl.ts) implements the service backend:
   - connecting to / disconnecting from a board
   - receiving and sending data
-- [src/browser/monitor/monitor-widget.tsx](./src/browser/monitor/monitor-widget.tsx) implements the serial monitor front-end:
+- [src/browser/serial/serial-connection-manager.ts](./src/browser/serial/serial-connection-manager.ts) handles the serial connection in the frontend
+- [src/browser/serial/monitor/monitor-widget.tsx](./src/browser/serial/monitor/monitor-widget.tsx) implements the serial monitor front-end:
   - viewing the output from a connected board
   - entering data to send to the board
+- [src/browser/serial/plotter/plotter-frontend-contribution.ts](./src/browser/serial/plotter/plotter-frontend-contribution.ts) implements the serial plotter front-end:
+  - opening a new window running the [Serial Plotter Web App](https://github.com/arduino/arduino-serial-plotter-webapp)
 
 #### Config Service
 
@@ -50,3 +53,30 @@ 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.
+
+#### Rebuild gRPC protocol interfaces
+  - Some CLI updates can bring changes to the gRPC interfaces, as the API might change. gRPC interfaces can be updated running the command
+    `yarn --cwd arduino-ide-extension generate-protocol`
+
+### Update **clangd** and **ClangFormat**
+
+The [**clangd** C++ language server](https://clangd.llvm.org/) and the [**ClangFormat** code formatter](https://clang.llvm.org/docs/ClangFormat.html) tool dependencies are managed in parallel. Updating them to a different version is done by the following procedure:
+
+1. If the target version is not already [available from the `arduino/clang-static-binaries` repository](https://github.com/arduino/clang-static-binaries/releases), submit [an issue there](https://github.com/arduino/clang-static-binaries/issues) requesting a build and wait for that to be completed.
+1. Validate the **ClangFormat** configuration for the target version by following the instructions [**here**](https://github.com/arduino/tooling-project-assets/tree/main/other/clang-format-configuration#clangformat-version-updates)
+1. Submit a pull request in the `arduino/arduino-ide` repository to update the version in the `arduino.clangd.version` key of [`package.json`](package.json).
+1. Submit a pull request in [the `arduino/tooling-project-assets` repository](https://github.com/arduino/tooling-project-assets) to update the version in the `vars.DEFAULT_CLANG_FORMAT_VERSION` field of [`Taskfile.yml`](https://github.com/arduino/tooling-project-assets/blob/main/Taskfile.yml).
+
+### Customize Icons
+ArduinoIde uses a customized version of FontAwesome.
+In order to update/replace icons follow the following steps:
+  - import the file `arduino-icons.json` in [Icomoon](https://icomoon.io/app/#/projects)
+  - load it
+  - edit the icons as needed
+  - !! download the **new** `arduino-icons.json` file and put it in this repo
+  - Click on "Generate Font" in Icomoon, then download
+  - place the updated fonts in the `src/style/fonts` directory

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

@@ -1,117 +0,0 @@
-{
-  "$id": "http://arduino.cc/arduino-cli.json",
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "type": "object",
-  "title": "Arduino CLI Configuration",
-  "properties": {
-    "board_manager": {
-      "type": "object",
-      "description": "Board Manager Configuration",
-      "properties": {
-        "additional_urls": {
-          "type": "array",
-          "description": "If your board requires 3rd party core packages to work, you can list the URLs to additional package indexes in the Arduino CLI configuration file.",
-          "items": {
-            "type": "string",
-            "description": "URL pointing to the 3rd party core package index JSON.",
-            "pattern": "^(.*)$"
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    "daemon": {
-      "type": "object",
-      "description": "CLI Daemon Configuration",
-      "properties": {
-        "port": {
-          "type": [
-            "string",
-            "number"
-          ],
-          "description": "The CLI daemon port where the gRPC clients can connect to.",
-          "pattern": "^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$",
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-    "directories": {
-      "type": "object",
-      "description": "Directories Configuration",
-      "properties": {
-        "data": {
-          "type": "string",
-          "description": "Path to the the data folder where core packages will be stored.",
-          "pattern": "^(.*)$"
-        },
-        "downloads": {
-          "type": "string",
-          "description": "Path to the staging folder.",
-          "pattern": "^(.*)$"
-        },
-        "user": {
-          "type": "string",
-          "description": "Path to the sketchbooks.",
-          "pattern": "^(.*)$"
-        }
-      },
-      "additionalProperties": false
-    },
-    "logging": {
-      "type": "object",
-      "description": "Logging Configuration",
-      "properties": {
-        "file": {
-          "type": "string",
-          "description": "Path to the file where logs will be written.",
-          "pattern": "^(.*)$"
-        },
-        "format": {
-          "type": "string",
-          "description": "The output format for the logs, can be 'text' or 'json'",
-          "enum": [
-            "text",
-            "json"
-          ]
-        },
-        "level": {
-          "type": "string",
-          "description": "Messages with this level and above will be logged.",
-          "enum": [
-            "trace",
-            "debug",
-            "info",
-            "warning",
-            "error",
-            "fatal",
-            "panic"
-          ]
-        }
-      },
-      "additionalProperties": false
-    },
-    "telemetry": {
-      "type": "object",
-      "description": "Telemetry Configuration",
-      "properties": {
-        "addr": {
-          "type": "string",
-          "description": "Address to the telemetry endpoint. Must be a full address with host, address, and port. For instance, ':9090' represents 'localhost:9090'",
-          "pattern": "^(.*)$"
-        },
-        "enabled": {
-          "type": "boolean",
-          "description": "Whether the telemetry is enabled or not."
-        },
-        "additionalProperties": false
-      },
-      "additionalProperties": false
-    }
-  },
-  "// TODOs": [
-    "additionalProperties should be true. See the new telemetry entry"
-  ],
-  "additionalProperties": false
-}

arduino-ide-extension/package.json

@@ -1,74 +1,108 @@
 {
   "name": "arduino-ide-extension",
-  "version": "0.1.2",
+  "version": "2.0.3",
   "description": "An extension for Theia building the Arduino IDE",
-  "license": "MIT",
+  "license": "AGPL-3.0-or-later",
   "scripts": {
-    "prepare": "yarn download-cli && yarn download-ls && yarn clean && yarn download-examples && yarn build",
+    "prepare": "yarn download-cli && yarn download-fwuploader && yarn download-ls && yarn copy-i18n && yarn clean && yarn download-examples && yarn build && yarn test",
     "clean": "rimraf lib",
+    "compose-changelog": "node ./scripts/compose-changelog.js",
     "download-cli": "node ./scripts/download-cli.js",
+    "download-fwuploader": "node ./scripts/download-fwuploader.js",
+    "copy-i18n": "npx ncp ../i18n ./build/i18n",
     "download-ls": "node ./scripts/download-ls.js",
     "download-examples": "node ./scripts/download-examples.js",
     "generate-protocol": "node ./scripts/generate-protocol.js",
-    "lint": "tslint -c ./tslint.json --project ./tsconfig.json",
+    "lint": "eslint",
     "build": "tsc && ncp ./src/node/cli-protocol/ ./lib/node/cli-protocol/ && yarn lint",
     "watch": "tsc -w",
     "test": "mocha \"./lib/test/**/*.test.js\"",
     "test:watch": "mocha --watch --watch-files lib \"./lib/test/**/*.test.js\""
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.1.1",
-    "@theia/application-package": "next",
-    "@theia/core": "next",
-    "@theia/editor": "next",
-    "@theia/filesystem": "next",
-    "@theia/git": "next",
-    "@theia/languages": "next",
-    "@theia/markers": "next",
-    "@theia/monaco": "next",
-    "@theia/navigator": "next",
-    "@theia/outline-view": "next",
-    "@theia/preferences": "next",
-    "@theia/output": "next",
-    "@theia/search-in-workspace": "next",
-    "@theia/terminal": "next",
-    "@theia/workspace": "next",
+    "@grpc/grpc-js": "^1.6.7",
+    "@theia/application-package": "1.25.0",
+    "@theia/core": "1.25.0",
+    "@theia/editor": "1.25.0",
+    "@theia/electron": "1.25.0",
+    "@theia/filesystem": "1.25.0",
+    "@theia/keymaps": "1.25.0",
+    "@theia/markers": "1.25.0",
+    "@theia/monaco": "1.25.0",
+    "@theia/navigator": "1.25.0",
+    "@theia/outline-view": "1.25.0",
+    "@theia/output": "1.25.0",
+    "@theia/preferences": "1.25.0",
+    "@theia/search-in-workspace": "1.25.0",
+    "@theia/terminal": "1.25.0",
+    "@theia/workspace": "1.25.0",
+    "@tippyjs/react": "^4.2.5",
+    "@types/atob": "^2.1.2",
+    "@types/auth0-js": "^9.14.0",
+    "@types/btoa": "^1.2.3",
     "@types/dateformat": "^3.0.1",
+    "@types/deep-equal": "^1.0.1",
     "@types/deepmerge": "^2.2.0",
-    "@types/glob": "^5.0.35",
+    "@types/glob": "^7.2.0",
     "@types/google-protobuf": "^3.7.2",
     "@types/js-yaml": "^3.12.2",
+    "@types/keytar": "^4.4.0",
     "@types/lodash.debounce": "^4.0.6",
     "@types/ncp": "^2.0.4",
+    "@types/node-fetch": "^2.5.7",
     "@types/ps-tree": "^1.1.0",
     "@types/react-select": "^3.0.0",
-    "@types/sinon": "^7.5.2",
+    "@types/react-tabs": "^2.3.2",
     "@types/temp": "^0.8.34",
     "@types/which": "^1.3.1",
     "ajv": "^6.5.3",
-    "css-element-queries": "^1.2.0",
+    "arduino-serial-plotter-webapp": "0.2.0",
+    "async-mutex": "^0.3.0",
+    "atob": "^2.1.2",
+    "auth0-js": "^9.14.0",
+    "btoa": "^1.2.1",
+    "classnames": "^2.3.1",
     "dateformat": "^3.0.3",
-    "deepmerge": "^4.2.2",
-    "fuzzy": "^0.1.3",
+    "deep-equal": "^2.0.5",
+    "deepmerge": "2.0.1",
+    "electron-updater": "^4.6.5",
+    "fast-safe-stringify": "^2.1.1",
     "glob": "^7.1.6",
-    "google-protobuf": "^3.11.4",
-    "lodash.debounce": "^4.0.8",
+    "google-protobuf": "^3.20.1",
+    "hash.js": "^1.1.7",
+    "is-valid-path": "^0.1.1",
     "js-yaml": "^3.13.1",
+    "jwt-decode": "^3.1.2",
+    "keytar": "7.2.0",
+    "lodash.debounce": "^4.0.8",
     "ncp": "^2.0.0",
+    "node-fetch": "^2.6.1",
+    "open": "^8.0.6",
     "p-queue": "^5.0.0",
     "ps-tree": "^1.2.0",
+    "query-string": "^7.0.1",
+    "react-disable": "^0.1.0",
+    "react-markdown": "^8.0.0",
     "react-select": "^3.0.4",
-    "semver": "^6.3.0",
+    "react-tabs": "^3.1.2",
+    "react-window": "^1.8.6",
+    "semver": "^7.3.2",
     "string-natural-compare": "^2.0.3",
     "temp": "^0.9.1",
+    "temp-dir": "^2.0.0",
     "tree-kill": "^1.2.1",
     "upath": "^1.1.2",
+    "url": "^0.11.0",
     "which": "^1.3.1"
   },
   "devDependencies": {
+    "@octokit/rest": "^18.12.0",
     "@types/chai": "^4.2.7",
     "@types/chai-string": "^1.4.2",
     "@types/mocha": "^5.2.7",
+    "@types/react-window": "^1.8.5",
+    "@types/sinon": "^10.0.6",
+    "@types/sinon-chai": "^3.2.6",
     "chai": "^4.2.0",
     "chai-string": "^1.5.0",
     "decompress": "^4.2.0",
@@ -77,10 +111,13 @@
     "download": "^7.1.0",
     "grpc_tools_node_protoc_ts": "^4.1.0",
     "mocha": "^7.0.0",
+    "mockdate": "^3.0.5",
     "moment": "^2.24.0",
     "protoc": "^1.0.4",
     "shelljs": "^0.8.3",
-    "sinon": "^9.0.1",
+    "sinon": "^12.0.1",
+    "sinon-chai": "^3.7.0",
+    "typemoq": "^2.1.0",
     "uuid": "^3.2.1",
     "yargs": "^11.1.0"
   },
@@ -89,7 +126,8 @@
   },
   "mocha": {
     "require": [
-      "reflect-metadata/Reflect"
+      "reflect-metadata/Reflect",
+      "ignore-styles"
     ],
     "reporter": "spec",
     "colors": true,
@@ -109,11 +147,27 @@
       "frontend": "lib/browser/arduino-ide-frontend-module"
     },
     {
-      "frontend": "lib/browser/theia/core/browser-menu-module",
       "frontendElectron": "lib/electron-browser/theia/core/electron-menu-module"
     },
     {
-      "frontend": "lib/browser/boards/quick-open/boards-quick-open-module"
+      "frontendElectron": "lib/electron-browser/theia/core/electron-window-module"
+    },
+    {
+      "electronMain": "lib/electron-main/arduino-electron-main-module"
     }
-  ]
+  ],
+  "arduino": {
+    "cli": {
+      "version": "0.29.0"
+    },
+    "fwuploader": {
+      "version": "2.2.2"
+    },
+    "clangd": {
+      "version": "14.0.0"
+    },
+    "languageServer": {
+      "version": "0.7.2"
+    }
+  }
 }

arduino-ide-extension/scripts/compose-changelog.js

@@ -0,0 +1,116 @@
+// @ts-check
+
+(async () => {
+  const { Octokit } = require('@octokit/rest');
+  const fs = require('fs');
+  const path = require('path');
+
+  const octokit = new Octokit({
+    userAgent: 'Arduino IDE compose-changelog.js',
+  });
+
+  const response = await octokit.rest.repos
+    .listReleases({
+      owner: 'arduino',
+      repo: 'arduino-ide',
+    })
+    .catch((err) => {
+      console.error(err);
+      process.exit(1);
+    });
+
+  const releases = response.data;
+
+  let fullChangelog = releases.reduce((acc, item, index) => {
+    // Process each line separately
+    const body = item.body.split('\n').map(processLine).join('\n');
+    // item.name is the name of the release changelog
+    return (
+      acc +
+      `## ${item.name}\n\n${body}${
+        index !== releases.length - 1 ? '\n\n---\n\n' : '\n'
+      }`
+    );
+  }, '');
+
+  const args = process.argv.slice(2);
+  if (args.length == 0) {
+    console.error('Missing argument to destination file');
+    process.exit(1);
+  }
+  const changelogFile = path.resolve(args[0]);
+
+  await fs.writeFile(
+    changelogFile,
+    fullChangelog,
+    {
+      flag: 'w+',
+    },
+    (err) => {
+      if (err) {
+        console.error(err);
+        process.exit(1);
+      }
+      console.log('Changelog written to', changelogFile);
+    }
+  );
+})();
+
+// processLine applies different substitutions to line string.
+// We're assuming that there are no more than one substitution
+// per line to be applied.
+const processLine = (line) => {
+  // Check if a link with one of the following format exists:
+  // * [#123](https://github.com/arduino/arduino-ide/pull/123)
+  // * [#123](https://github.com/arduino/arduino-ide/issues/123)
+  // * [#123](https://github.com/arduino/arduino-ide/pull/123/)
+  // * [#123](https://github.com/arduino/arduino-ide/issues/123/)
+  // If it does return the line as is.
+  let r =
+    /(\(|\[)#\d+(\)|\])(\(|\[)https:\/\/github\.com\/arduino\/arduino-ide\/(pull|issues)\/(\d+)\/?(\)|\])/gm;
+  if (r.test(line)) {
+    return line;
+  }
+
+  // Check if a issue or PR link with the following format exists:
+  // * #123
+  // If it does it's changed to:
+  // * [#123](https://github.com/arduino/arduino-ide/pull/123)
+  r = /(?<![\w\d\/_]{1})#((\d)+)(?![\w\d\/_]{1})/gm;
+  if (r.test(line)) {
+    return line.replace(
+      r,
+      `[#$1](https://github.com/arduino/arduino-ide/pull/$1)`
+    );
+  }
+
+  // Check if a link with one of the following format exists:
+  // * https://github.com/arduino/arduino-ide/pull/123
+  // * https://github.com/arduino/arduino-ide/issues/123
+  // * https://github.com/arduino/arduino-ide/pull/123/
+  // * https://github.com/arduino/arduino-ide/issues/123/
+  // If it does it's changed respectively to:
+  // * [#123](https://github.com/arduino/arduino-ide/pull/123)
+  // * [#123](https://github.com/arduino/arduino-ide/issues/123)
+  // * [#123](https://github.com/arduino/arduino-ide/pull/123/)
+  // * [#123](https://github.com/arduino/arduino-ide/issues/123/)
+  r =
+    /(https:\/\/github\.com\/arduino\/arduino-ide\/(pull|issues)\/(\d+)\/?)/gm;
+  if (r.test(line)) {
+    return line.replace(r, `[#$3]($1)`);
+  }
+
+  // Check if a link with the following format exists:
+  // * https://github.com/arduino/arduino-ide/compare/2.0.0-rc2...2.0.0-rc3
+  // * https://github.com/arduino/arduino-ide/compare/2.0.0-rc2...2.0.0-rc3/
+  // If it does it's changed to:
+  // * [`2.0.0-rc2...2.0.0-rc3`](https://github.com/arduino/arduino-ide/compare/2.0.0-rc2...2.0.0-rc3)
+  r =
+    /(https:\/\/github\.com\/arduino\/arduino-ide\/compare\/([^\/]*))\/?\s?/gm;
+  if (r.test(line)) {
+    return line.replace(r, '[`$2`]($1)');
+  }
+
+  // If nothing matches just return the line as is
+  return line;
+};

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

@@ -1,62 +1,90 @@
 // @ts-check
-// The links to the downloads as of today (02.09.) are the followings:
-// In order to get the latest nightly build for your platform use the following links replacing <DATE> with the current date, using the format YYYYMMDD (i.e for 2019/Aug/06 use 20190806 )
-// Linux 64 bit: https://downloads.arduino.cc/arduino-cli/nightly/arduino-cli_nightly-<DATE>_Linux_64bit.tar.gz
-// Linux ARM 64 bit: https://downloads.arduino.cc/arduino-cli/nightly/arduino-cli_nightly-<DATE>_Linux_ARM64.tar.gz
-// Windows 64 bit: https://downloads.arduino.cc/arduino-cli/nightly/arduino-cli_nightly-<DATE>_Windows_64bit.zip
-// Mac OSX: https://downloads.arduino.cc/arduino-cli/nightly/arduino-cli_nightly-<DATE>_macOS_64bit.tar.gz
-// [...]
-// redirecting to latest generated builds by replacing latest with the latest available build date, using the format YYYYMMDD (i.e for 2019/Aug/06 latest is replaced with 20190806 
 
-(() => {
+(async () => {
+  const path = require('path');
+  const shell = require('shelljs');
+  const semver = require('semver');
+  const moment = require('moment');
+  const downloader = require('./downloader');
+  const { taskBuildFromGit } = require('./utils');
 
-    const DEFAULT_VERSION = '0.13.0'; // require('moment')().format('YYYYMMDD');
-
-    const path = require('path');
-    const shell = require('shelljs');
-    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;
-        }
-    })();
-    if (!suffix) {
-        shell.echo(`The CLI is not available for ${platform} ${arch}.`);
-        shell.exit(1);
+  const version = (() => {
+    const pkg = require(path.join(__dirname, '..', 'package.json'));
+    if (!pkg) {
+      return undefined;
     }
 
-    const url = `https://downloads.arduino.cc/arduino-cli${version.startsWith('nightly-') ? '/nightly' : ''}/arduino-cli_${version}_${suffix}`;
-    downloader.downloadUnzipFile(url, cli, 'arduino-cli', force);
+    const { arduino } = pkg;
+    if (!arduino) {
+      return undefined;
+    }
 
+    const { cli } = arduino;
+    if (!cli) {
+      return undefined;
+    }
+
+    const { version } = cli;
+    return version;
+  })();
+
+  if (!version) {
+    shell.echo(`Could not retrieve CLI version info from the 'package.json'.`);
+    shell.exit(1);
+  }
+
+  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':
+          if (arch === 'arm64') {
+            return 'macOS_ARM64.tar.gz';
+          }
+          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 {
+    taskBuildFromGit(version, destinationPath, 'CLI');
+  }
 })();

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

@@ -1,23 +1,96 @@
 // @ts-check
 
+// The version to use.
+const version = '1.10.0';
+
 (async () => {
+  const os = require('os');
+  const { promises: fs } = require('fs');
+  const path = require('path');
+  const shell = require('shelljs');
+  const { v4 } = require('uuid');
 
-    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);
+  }
 
-    const repository = path.join(os.tmpdir(), `${v4()}-arduino-examples`);
-    if (shell.mkdir('-p', repository).code !== 0) {
-        shell.exit(1);
+  if (
+    shell.exec(
+      `git clone https://github.com/arduino/arduino-examples.git ${repository}`
+    ).code !== 0
+  ) {
+    shell.exit(1);
+  }
+
+  if (
+    shell.exec(`git -C ${repository} checkout tags/${version} -b ${version}`)
+      .code !== 0
+  ) {
+    shell.exit(1);
+  }
+
+  const destination = path.join(__dirname, '..', 'Examples');
+  shell.mkdir('-p', destination);
+  shell.cp('-fR', path.join(repository, 'examples', '*'), destination);
+
+  const isSketch = async (pathLike) => {
+    try {
+      const names = await fs.readdir(pathLike);
+      const dirName = path.basename(pathLike);
+      return names.indexOf(`${dirName}.ino`) !== -1;
+    } catch (e) {
+      if (e.code === 'ENOTDIR') {
+        return false;
+      }
+      throw e;
     }
-
-    if (shell.exec(`git clone https://github.com/arduino/arduino.git --depth 1 ${repository}`).code !== 0) {
-        shell.exit(1);
+  };
+  const examples = [];
+  const categories = await fs.readdir(destination);
+  const visit = async (pathLike, container) => {
+    const stat = await fs.lstat(pathLike);
+    if (stat.isDirectory()) {
+      if (await isSketch(pathLike)) {
+        container.sketches.push({
+          name: path.basename(pathLike),
+          relativePath: path.relative(destination, pathLike),
+        });
+      } else {
+        const names = await fs.readdir(pathLike);
+        for (const name of names) {
+          const childPath = path.join(pathLike, name);
+          if (await isSketch(childPath)) {
+            container.sketches.push({
+              name,
+              relativePath: path.relative(destination, childPath),
+            });
+          } else {
+            const child = {
+              label: name,
+              children: [],
+              sketches: [],
+            };
+            container.children.push(child);
+            await visit(childPath, child);
+          }
+        }
+      }
     }
-
-    const destination = path.join(__dirname, '..', 'Examples');
-    shell.mkdir('-p', destination);
-    shell.cp('-fR', path.join(repository, 'build', 'shared', 'examples', '*'), destination);
-
+  };
+  for (const category of categories) {
+    const example = {
+      label: category,
+      children: [],
+      sketches: [],
+    };
+    await visit(path.join(destination, category), example);
+    examples.push(example);
+  }
+  await fs.writeFile(
+    path.join(destination, 'examples.json'),
+    JSON.stringify(examples, null, 2),
+    { encoding: 'utf8' }
+  );
+  shell.echo(`Generated output to ${path.join(destination, 'examples.json')}`);
 })();

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

@@ -0,0 +1,166 @@
+// @ts-check
+
+(async () => {
+  const fs = require('fs');
+  const path = require('path');
+  const temp = require('temp');
+  const shell = require('shelljs');
+  const semver = require('semver');
+  const downloader = require('./downloader');
+
+  const version = (() => {
+    const pkg = require(path.join(__dirname, '..', 'package.json'));
+    if (!pkg) {
+      return undefined;
+    }
+
+    const { arduino } = pkg;
+    if (!arduino) {
+      return undefined;
+    }
+
+    const { fwuploader } = arduino;
+    if (!fwuploader) {
+      return undefined;
+    }
+
+    const { version } = fwuploader;
+    return version;
+  })();
+
+  if (!version) {
+    shell.echo(
+      `Could not retrieve Firmware Uploader version info from the 'package.json'.`
+    );
+    shell.exit(1);
+  }
+
+  const { platform, arch } = process;
+  const buildFolder = path.join(__dirname, '..', 'build');
+  const fwuploderName = `arduino-fwuploader${
+    platform === 'win32' ? '.exe' : ''
+  }`;
+  const destinationPath = path.join(buildFolder, fwuploderName);
+
+  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 Firmware Uploader is not available for ${platform} ${arch}.`
+      );
+      shell.exit(1);
+    }
+    if (semver.valid(version)) {
+      const url = `https://downloads.arduino.cc/arduino-fwuploader/arduino-fwuploader_${version}_${suffix}`;
+      shell.echo(
+        `📦  Identified released version of the Firmware Uploader. Downloading version ${version} from '${url}'`
+      );
+      await downloader.downloadUnzipFile(
+        url,
+        destinationPath,
+        'arduino-fwuploader'
+      );
+    } 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 Firmware Uploader from ${url}. Commitish: ${
+        commitish ? commitish : 'HEAD'
+      }`
+    );
+
+    if (fs.existsSync(destinationPath)) {
+      shell.echo(
+        `Skipping the Firmware Uploader 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 Firmware Uploader source to ${tempRepoPath}...`);
+    if (shell.exec(`git clone ${url} ${tempRepoPath}`).code !== 0) {
+      shell.exit(1);
+    }
+    shell.echo('<<< Cloned Firmware Uploader 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 Firmware Uploader...`);
+    if (shell.exec('go build', { cwd: tempRepoPath }).code !== 0) {
+      shell.exit(1);
+    }
+    shell.echo('<<< Firmware Uploader build done.');
+
+    if (!fs.existsSync(path.join(tempRepoPath, fwuploderName))) {
+      shell.echo(
+        `Could not find the Firmware Uploader at ${path.join(
+          tempRepoPath,
+          fwuploderName
+        )}.`
+      );
+      shell.exit(1);
+    }
+
+    const builtFwUploaderPath = path.join(tempRepoPath, fwuploderName);
+    shell.echo(
+      `>>> Copying Firmware Uploader from ${builtFwUploaderPath} to ${destinationPath}...`
+    );
+    if (shell.cp(builtFwUploaderPath, destinationPath).code !== 0) {
+      shell.exit(1);
+    }
+    shell.echo(`<<< Copied the Firmware Uploader.`);
+
+    shell.echo('<<< Verifying Firmware Uploader...');
+    if (!fs.existsSync(destinationPath)) {
+      shell.exit(1);
+    }
+    shell.echo('>>> Verified Firmware Uploader.');
+  }
+})();

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

@@ -4,69 +4,130 @@
 // - https://downloads.arduino.cc/arduino-language-server/clangd/clangd_${VERSION}_${SUFFIX}
 
 (() => {
+  const path = require('path');
+  const shell = require('shelljs');
+  const downloader = require('./downloader');
+  const { goBuildFromGit } = require('./utils');
 
-    const DEFAULT_ALS_VERSION = 'nightly';
-    const DEFAULT_CLANGD_VERSION = '9.0.0';
+  const [DEFAULT_LS_VERSION, DEFAULT_CLANGD_VERSION] = (() => {
+    const pkg = require(path.join(__dirname, '..', 'package.json'));
+    if (!pkg) return [undefined, undefined];
 
-    const path = require('path');
-    const shell = require('shelljs');
-    const downloader = require('./downloader');
+    const { arduino } = pkg;
+    if (!arduino) return [undefined, undefined];
 
-    const yargs = require('yargs')
-        .option('ls-version', {
-            alias: 'lv',
-            default: DEFAULT_ALS_VERSION,
-            choices: ['nightly'],
-            describe: `The version of the 'arduino-language-server' to download. Defaults to ${DEFAULT_ALS_VERSION}.`
-        })
-        .option('clangd-version', {
-            alias: 'cv',
-            default: DEFAULT_CLANGD_VERSION,
-            choices: ['8.0.1', '9.0.0'],
-            describe: `The version of 'clangd' to download. Defaults to ${DEFAULT_CLANGD_VERSION}.`
-        })
-        .option('force-download', {
-            alias: 'fd',
-            default: false,
-            describe: `If set, this script force downloads the 'arduino-language-server' even if it already exists on the file system.`
-        })
-        .version(false).parse();
+    const { languageServer, clangd } = arduino;
+    if (!languageServer) return [undefined, undefined];
+    if (!clangd) return [undefined, undefined];
 
-    const alsVersion = yargs['ls-version'];
-    const clangdVersion = yargs['clangd-version']
-    const force = yargs['force-download'];
-    const { platform, arch } = process;
+    return [languageServer.version, clangd.version];
+  })();
 
-    const build = path.join(__dirname, '..', 'build');
-    const alsTarget = path.join(build, `arduino-language-server${platform === 'win32' ? '.exe' : ''}`);
+  if (!DEFAULT_LS_VERSION) {
+    shell.echo(
+      `Could not retrieve Arduino Language Server version info from the 'package.json'.`
+    );
+    shell.exit(1);
+  }
 
-    let clangdTarget, alsSuffix, clangdSuffix;
-    switch (platform) {
-        case 'darwin':
-            clangdTarget = path.join(build, 'bin', 'clangd')
-            alsSuffix = 'Darwin_amd64.zip';
-            clangdSuffix = 'macos.zip';
-            break;
-        case 'linux':
-            clangdTarget = path.join(build, 'bin', 'clangd')
-            alsSuffix = 'Linux_amd64.zip';
-            clangdSuffix = 'linux.zip'
-            break;
-        case 'win32':
-            clangdTarget = path.join(build, 'clangd.exe')
-            alsSuffix = 'Windows_NT_amd64.zip';
-            clangdSuffix = 'windows.zip';
-            break;
+  if (!DEFAULT_CLANGD_VERSION) {
+    shell.echo(
+      `Could not retrieve clangd version info from the 'package.json'.`
+    );
+    shell.exit(1);
+  }
+
+  const yargs = require('yargs')
+    .option('ls-version', {
+      alias: 'lv',
+      default: DEFAULT_LS_VERSION,
+      describe: `The version of the 'arduino-language-server' to download. Defaults to ${DEFAULT_LS_VERSION}.`,
+    })
+    .option('clangd-version', {
+      alias: 'cv',
+      default: DEFAULT_CLANGD_VERSION,
+      choices: [DEFAULT_CLANGD_VERSION, 'snapshot_20210124'],
+      describe: `The version of 'clangd' to download. Defaults to ${DEFAULT_CLANGD_VERSION}.`,
+    })
+    .option('force-download', {
+      alias: 'fd',
+      default: false,
+      describe: `If set, this script force downloads the 'arduino-language-server' even if it already exists on the file system.`,
+    })
+    .version(false)
+    .parse();
+
+  const lsVersion = yargs['ls-version'];
+  const clangdVersion = yargs['clangd-version'];
+  const force = yargs['force-download'];
+  const { platform, arch } = process;
+  const platformArch = platform + '-' + arch;
+  const build = path.join(__dirname, '..', 'build');
+  const lsExecutablePath = path.join(
+    build,
+    `arduino-language-server${platform === 'win32' ? '.exe' : ''}`
+  );
+  let clangdExecutablePath, clangFormatExecutablePath, lsSuffix, clangdSuffix;
+
+  switch (platformArch) {
+    case 'darwin-x64':
+      clangdExecutablePath = path.join(build, 'clangd');
+      clangFormatExecutablePath = path.join(build, 'clang-format');
+      lsSuffix = 'macOS_64bit.tar.gz';
+      clangdSuffix = 'macOS_64bit';
+      break;
+    case 'darwin-arm64':
+      clangdExecutablePath = path.join(build, 'clangd');
+      clangFormatExecutablePath = path.join(build, 'clang-format');
+      lsSuffix = 'macOS_ARM64.tar.gz';
+      clangdSuffix = 'macOS_ARM64';
+      break;
+    case 'linux-x64':
+      clangdExecutablePath = path.join(build, 'clangd');
+      clangFormatExecutablePath = path.join(build, 'clang-format');
+      lsSuffix = 'Linux_64bit.tar.gz';
+      clangdSuffix = 'Linux_64bit';
+      break;
+    case 'win32-x64':
+      clangdExecutablePath = path.join(build, 'clangd.exe');
+      clangFormatExecutablePath = path.join(build, 'clang-format.exe');
+      lsSuffix = 'Windows_64bit.zip';
+      clangdSuffix = 'Windows_64bit';
+      break;
+    default:
+      throw new Error(`Unsupported platform/arch: ${platformArch}.`);
+  }
+  if (!lsSuffix || !clangdSuffix) {
+    shell.echo(
+      `The arduino-language-server is not available for ${platform} ${arch}.`
+    );
+    shell.exit(1);
+  }
+
+  if (typeof lsVersion === 'string') {
+    const lsUrl = `https://downloads.arduino.cc/arduino-language-server/${
+      lsVersion === 'nightly'
+        ? 'nightly/arduino-language-server'
+        : 'arduino-language-server_' + lsVersion
+    }_${lsSuffix}`;
+    downloader.downloadUnzipAll(lsUrl, build, lsExecutablePath, force);
+  } else {
+    goBuildFromGit(lsVersion, lsExecutablePath, 'language-server');
+  }
+
+  const clangdUrl = `https://downloads.arduino.cc/tools/clangd_${clangdVersion}_${clangdSuffix}.tar.bz2`;
+  downloader.downloadUnzipAll(clangdUrl, build, clangdExecutablePath, force, {
+    strip: 1,
+  }); // `strip`: the new clangd (12.x) is zipped into a folder, so we have to strip the outmost folder.
+
+  const clangdFormatUrl = `https://downloads.arduino.cc/tools/clang-format_${clangdVersion}_${clangdSuffix}.tar.bz2`;
+  downloader.downloadUnzipAll(
+    clangdFormatUrl,
+    build,
+    clangFormatExecutablePath,
+    force,
+    {
+      strip: 1,
     }
-    if (!alsSuffix) {
-        shell.echo(`The arduino-language-server is not available for ${platform} ${arch}.`);
-        shell.exit(1);
-    }
-
-    const alsUrl = `https://downloads.arduino.cc/arduino-language-server/${alsVersion === 'nightly' ? 'nightly/arduino-language-server' : 'arduino-language-server_' + alsVersion}_${alsSuffix}`;
-    downloader.downloadUnzipAll(alsUrl, build, alsTarget, force);
-
-    const clangdUrl = `https://downloads.arduino.cc/arduino-language-server/clangd/clangd_${clangdVersion}_${clangdSuffix}`;
-    downloader.downloadUnzipAll(clangdUrl, build, clangdTarget, force);
-
+  );
 })();

arduino-ide-extension/scripts/downloader.js

@@ -5,112 +5,128 @@ const download = require('download');
 const decompress = require('decompress');
 const unzip = require('decompress-unzip');
 const untargz = require('decompress-targz');
+const untarbz2 = require('decompress-tarbz2');
 
 process.on('unhandledRejection', (reason, _) => {
-    shell.echo(String(reason));
-    shell.exit(1);
-    throw reason;
+  shell.echo(String(reason));
+  shell.exit(1);
+  throw reason;
 });
-process.on('uncaughtException', error => {
-    shell.echo(String(error));
-    shell.exit(1);
-    throw error;
+process.on('uncaughtException', (error) => {
+  shell.echo(String(error));
+  shell.exit(1);
+  throw 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) => {
-    if (fs.existsSync(targetFile) && !force) {
-        shell.echo(`Skipping download because file already exists: ${targetFile}`);
-        return;
-    }
-    if (!fs.existsSync(path.dirname(targetFile))) {
-        if (shell.mkdir('-p', path.dirname(targetFile)).code !== 0) {
-            shell.echo('Could not create new directory.');
-            shell.exit(1);
-        }
+exports.downloadUnzipFile = async (
+  url,
+  targetFile,
+  filePrefix,
+  force = false
+) => {
+  if (fs.existsSync(targetFile) && !force) {
+    shell.echo(`Skipping download because file already exists: ${targetFile}`);
+    return;
+  }
+  if (!fs.existsSync(path.dirname(targetFile))) {
+    if (shell.mkdir('-p', path.dirname(targetFile)).code !== 0) {
+      shell.echo('Could not create new directory.');
+      shell.exit(1);
     }
+  }
 
-    const downloads = path.join(__dirname, '..', 'downloads');
-    if (shell.rm('-rf', targetFile, downloads).code !== 0) {
-        shell.exit(1);
-    }
+  const downloads = path.join(__dirname, '..', 'downloads');
+  if (shell.rm('-rf', targetFile, downloads).code !== 0) {
+    shell.exit(1);
+  }
 
-    shell.echo(`>>> Downloading from '${url}'...`);
-    const data = await download(url);
-    shell.echo(`<<< Download succeeded.`);
+  shell.echo(`>>> Downloading from '${url}'...`);
+  const data = await download(url);
+  shell.echo(`<<< Download succeeded.`);
 
-    shell.echo('>>> Decompressing...');
-    const files = await decompress(data, downloads, {
-        plugins: [
-            unzip(),
-            untargz()
-        ]
-    });
-    if (files.length === 0) {
-        shell.echo('Error ocurred while decompressing the archive.');
-        shell.exit(1);
-    }
-    const fileIndex = files.findIndex(f => f.path.startsWith(filePrefix));
-    if (fileIndex === -1) {
-        shell.echo(`The downloaded artifact does not contain any file with prefix ${filePrefix}.`);
-        shell.exit(1);
-    }
-    shell.echo('<<< Decompressing succeeded.');
+  shell.echo('>>> Decompressing...');
+  const files = await decompress(data, downloads, {
+    plugins: [unzip(), untargz(), untarbz2()],
+  });
+  if (files.length === 0) {
+    shell.echo('Error ocurred while decompressing the archive.');
+    shell.exit(1);
+  }
+  const fileIndex = files.findIndex((f) => f.path.startsWith(filePrefix));
+  if (fileIndex === -1) {
+    shell.echo(
+      `The downloaded artifact does not contain any file with prefix ${filePrefix}.`
+    );
+    shell.exit(1);
+  }
+  shell.echo('<<< Decompressing succeeded.');
 
-    if (shell.mv('-f', path.join(downloads, files[fileIndex].path), targetFile).code !== 0) {
-        shell.echo(`Could not move file to target path: ${targetFile}`);
-        shell.exit(1);
-    }
-    if (!fs.existsSync(targetFile)) {
-        shell.echo(`Could not find file: ${targetFile}`);
-        shell.exit(1);
-    }
-    shell.echo(`Done: ${targetFile}`);
-}
+  if (
+    shell.mv('-f', path.join(downloads, files[fileIndex].path), targetFile)
+      .code !== 0
+  ) {
+    shell.echo(`Could not move file to target path: ${targetFile}`);
+    shell.exit(1);
+  }
+  if (!fs.existsSync(targetFile)) {
+    shell.echo(`Could not find file: ${targetFile}`);
+    shell.exit(1);
+  }
+  shell.echo(`Done: ${targetFile}`);
+};
 
 /**
  * @param url {string}        Download URL
  * @param targetDir {string}  Directory into which to decompress the archive
  * @param targetFile {string} Path to the main file expected after decompressing
  * @param force {boolean}     Whether to download even if the target file exists
+ * @param decompressOptions {import('decompress').DecompressOptions}
  */
-exports.downloadUnzipAll = async (url, targetDir, targetFile, force) => {
-    if (fs.existsSync(targetFile) && !force) {
-        shell.echo(`Skipping download because file already exists: ${targetFile}`);
-        return;
-    }
-    if (!fs.existsSync(targetDir)) {
-        if (shell.mkdir('-p', targetDir).code !== 0) {
-            shell.echo('Could not create new directory.');
-            shell.exit(1);
-        }
+exports.downloadUnzipAll = async (
+  url,
+  targetDir,
+  targetFile,
+  force,
+  decompressOptions = undefined
+) => {
+  if (fs.existsSync(targetFile) && !force) {
+    shell.echo(`Skipping download because file already exists: ${targetFile}`);
+    return;
+  }
+  if (!fs.existsSync(targetDir)) {
+    if (shell.mkdir('-p', targetDir).code !== 0) {
+      shell.echo('Could not create new directory.');
+      shell.exit(1);
     }
+  }
 
-    shell.echo(`>>> Downloading from '${url}'...`);
-    const data = await download(url);
-    shell.echo(`<<< Download succeeded.`);
+  shell.echo(`>>> Downloading from '${url}'...`);
+  const data = await download(url);
+  shell.echo(`<<< Download succeeded.`);
 
-    shell.echo('>>> Decompressing...');
-    const files = await decompress(data, targetDir, {
-        plugins: [
-            unzip(),
-            untargz()
-        ]
-    });
-    if (files.length === 0) {
-        shell.echo('Error ocurred while decompressing the archive.');
-        shell.exit(1);
-    }
-    shell.echo('<<< Decompressing succeeded.');
+  shell.echo('>>> Decompressing...');
+  let options = {
+    plugins: [unzip(), untargz(), untarbz2()],
+  };
+  if (decompressOptions) {
+    options = Object.assign(options, decompressOptions);
+  }
+  const files = await decompress(data, targetDir, options);
+  if (files.length === 0) {
+    shell.echo('Error ocurred while decompressing the archive.');
+    shell.exit(1);
+  }
+  shell.echo('<<< Decompressing succeeded.');
 
-    if (!fs.existsSync(targetFile)) {
-        shell.echo(`Could not find file: ${targetFile}`);
-        shell.exit(1);
-    }
-    shell.echo(`Done: ${targetFile}`);
-}
+  if (!fs.existsSync(targetFile)) {
+    shell.echo(`Could not find file: ${targetFile}`);
+    shell.exit(1);
+  }
+  shell.echo(`Done: ${targetFile}`);
+};

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

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

arduino-ide-extension/scripts/utils.js

@@ -0,0 +1,110 @@
+/**
+ * Clones something from GitHub and builds it with [`Task`](https://taskfile.dev/).
+ *
+ * @param version {object} the version object.
+ * @param destinationPath {string} the absolute path of the output binary. For example, `C:\\folder\\arduino-cli.exe` or `/path/to/arduino-language-server`
+ * @param taskName {string} for the CLI logging . Can be `'CLI'` or `'language-server'`, etc.
+ */
+exports.taskBuildFromGit = (version, destinationPath, taskName) => {
+  return buildFromGit('task', version, destinationPath, taskName);
+};
+
+/**
+ * Clones something from GitHub and builds it with `Golang`.
+ *
+ * @param version {object} the version object.
+ * @param destinationPath {string} the absolute path of the output binary. For example, `C:\\folder\\arduino-cli.exe` or `/path/to/arduino-language-server`
+ * @param taskName {string} for the CLI logging . Can be `'CLI'` or `'language-server'`, etc.
+ */
+exports.goBuildFromGit = (version, destinationPath, taskName) => {
+  return buildFromGit('go', version, destinationPath, taskName);
+};
+
+/**
+ * The `command` is either `go` or `task`.
+ */
+function buildFromGit(command, version, destinationPath, taskName) {
+  const fs = require('fs');
+  const path = require('path');
+  const temp = require('temp');
+  const shell = require('shelljs');
+
+  // We assume an object with `owner`, `repo`, commitish?` properties.
+  if (typeof version !== 'object') {
+    shell.echo(
+      `Expected a \`{ owner, repo, commitish }\` object. Got <${version}> instead.`
+    );
+  }
+  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 ${taskName} from ${url}. Commitish: ${
+      commitish ? commitish : 'HEAD'
+    }`
+  );
+
+  if (fs.existsSync(destinationPath)) {
+    shell.echo(
+      `Skipping the ${taskName} build because it already exists: ${destinationPath}`
+    );
+    return;
+  }
+
+  const buildFolder = path.join(__dirname, '..', 'build');
+  if (shell.mkdir('-p', buildFolder).code !== 0) {
+    shell.echo('Could not create build folder.');
+    shell.exit(1);
+  }
+
+  const tempRepoPath = temp.mkdirSync();
+  shell.echo(`>>> Cloning ${taskName} source to ${tempRepoPath}...`);
+  if (shell.exec(`git clone ${url} ${tempRepoPath}`).code !== 0) {
+    shell.exit(1);
+  }
+  shell.echo(`<<< Cloned ${taskName} 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 ${taskName}...`);
+  if (shell.exec(`${command} build`, { cwd: tempRepoPath }).code !== 0) {
+    shell.exit(1);
+  }
+  shell.echo(`<<< Done ${taskName} build.`);
+
+  const binName = path.basename(destinationPath);
+  if (!fs.existsSync(path.join(tempRepoPath, binName))) {
+    shell.echo(
+      `Could not find the ${taskName} at ${path.join(tempRepoPath, binName)}.`
+    );
+    shell.exit(1);
+  }
+
+  const binPath = path.join(tempRepoPath, binName);
+  shell.echo(
+    `>>> Copying ${taskName} from ${binPath} to ${destinationPath}...`
+  );
+  if (shell.cp(binPath, destinationPath).code !== 0) {
+    shell.exit(1);
+  }
+  shell.echo(`<<< Copied the ${taskName}.`);
+
+  shell.echo(`<<< Verifying ${taskName}...`);
+  if (!fs.existsSync(destinationPath)) {
+    shell.exit(1);
+  }
+  shell.echo(`>>> Verified ${taskName}.`);
+}

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

@@ -1,30 +0,0 @@
-import { Command } from '@theia/core/lib/common/command';
-
-/**
- * @deprecated all these commands should go under contributions and have their command, menu, keybinding, and toolbar contributions.
- */
-export namespace ArduinoCommands {
-
-    export const TOGGLE_COMPILE_FOR_DEBUG: Command = {
-        id: 'arduino-toggle-compile-for-debug'
-    };
-
-    /**
-     * Unlike `OPEN_SKETCH`, it opens all files from a sketch folder. (ino, cpp, etc...)
-     */
-    export const OPEN_SKETCH_FILES: Command = {
-        id: 'arduino-open-sketch-files'
-    };
-
-    export const OPEN_BOARDS_DIALOG: Command = {
-        id: 'arduino-open-boards-dialog'
-    };
-
-    export const TOGGLE_ADVANCED_MODE: Command = {
-        id: 'arduino-toggle-advanced-mode'
-    };
-    export const TOGGLE_ADVANCED_MODE_TOOLBAR: Command = {
-        id: 'arduino-toggle-advanced-mode-toolbar'
-    };
-
-}

arduino-ide-extension/src/browser/arduino-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,347 +1,292 @@
-import { MAIN_MENU_BAR, MenuContribution, MenuModelRegistry, SelectionService } from '@theia/core';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
 import {
-    ContextMenuRenderer,
-    FrontendApplication, FrontendApplicationContribution,
-    OpenerService, StatusBar, StatusBarAlignment
+  inject,
+  injectable,
+  postConstruct,
+} from '@theia/core/shared/inversify';
+import * as React from '@theia/core/shared/react';
+import {
+  MAIN_MENU_BAR,
+  MenuContribution,
+  MenuModelRegistry,
+} from '@theia/core';
+import {
+  FrontendApplication,
+  FrontendApplicationContribution,
 } from '@theia/core/lib/browser';
 import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';
-import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import { CommandContribution, CommandRegistry } from '@theia/core/lib/common/command';
+import {
+  TabBarToolbarContribution,
+  TabBarToolbarRegistry,
+} from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import { nls } from '@theia/core/lib/common';
+import {
+  CommandContribution,
+  CommandRegistry,
+} from '@theia/core/lib/common/command';
 import { MessageService } from '@theia/core/lib/common/message-service';
-import URI from '@theia/core/lib/common/uri';
-import { EditorMainMenu, EditorManager } from '@theia/editor/lib/browser';
-import { FileDialogService } from '@theia/filesystem/lib/browser/file-dialog';
-import { FileSystem } from '@theia/filesystem/lib/common';
-import { ProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution';
+import { EditorCommands, EditorMainMenu } from '@theia/editor/lib/browser';
 import { MonacoMenus } from '@theia/monaco/lib/browser/monaco-menu';
-import { FileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution';
-import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution';
-import { OutputContribution } from '@theia/output/lib/browser/output-contribution';
-import { ScmContribution } from '@theia/scm/lib/browser/scm-contribution';
-import { SearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution';
+import { FileNavigatorCommands } from '@theia/navigator/lib/browser/navigator-contribution';
 import { TerminalMenus } from '@theia/terminal/lib/browser/terminal-frontend-contribution';
-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 { ArduinoDaemon } from '../common/protocol/arduino-daemon';
-import { ConfigService } from '../common/protocol/config-service';
-import { FileSystemExt } from '../common/protocol/filesystem-ext';
-import { ArduinoCommands } from './arduino-commands';
-import { BoardsConfig } from './boards/boards-config';
-import { BoardsConfigDialog } from './boards/boards-config-dialog';
-import { BoardsDataStore } from './boards/boards-data-store';
-import { BoardsServiceClientImpl } from './boards/boards-service-client-impl';
+import { ArduinoPreferences } from './arduino-preferences';
+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';
-import { MonitorConnection } from './monitor/monitor-connection';
-import { MonitorViewContribution } from './monitor/monitor-view-contribution';
-import { WorkspaceService } from './theia/workspace/workspace-service';
+import { MonitorViewContribution } from './serial/monitor/monitor-view-contribution';
 import { ArduinoToolbar } from './toolbar/arduino-toolbar';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import { SerialPlotterContribution } from './serial/plotter/plotter-frontend-contribution';
 
 @injectable()
-export class ArduinoFrontendContribution implements FrontendApplicationContribution,
-    TabBarToolbarContribution, CommandContribution, MenuContribution, ColorContribution {
+export class ArduinoFrontendContribution
+  implements
+    FrontendApplicationContribution,
+    TabBarToolbarContribution,
+    CommandContribution,
+    MenuContribution,
+    ColorContribution
+{
+  @inject(MessageService)
+  private readonly messageService: MessageService;
 
-    @inject(MessageService)
-    protected readonly messageService: MessageService;
+  @inject(BoardsServiceProvider)
+  private readonly boardsServiceProvider: BoardsServiceProvider;
 
-    @inject(BoardsService)
-    protected readonly boardsService: BoardsService;
+  @inject(CommandRegistry)
+  private readonly commandRegistry: CommandRegistry;
 
-    @inject(CoreService)
-    protected readonly coreService: CoreService;
+  @inject(ArduinoPreferences)
+  private readonly arduinoPreferences: ArduinoPreferences;
 
-    @inject(ToolOutputServiceClient)
-    protected readonly toolOutputServiceClient: ToolOutputServiceClient;
+  @inject(FrontendApplicationStateService)
+  private readonly appStateService: FrontendApplicationStateService;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClientImpl: BoardsServiceClientImpl;
+  @postConstruct()
+  protected async init(): Promise<void> {
+    if (!window.navigator.onLine) {
+      // tslint:disable-next-line:max-line-length
+      this.messageService.warn(
+        nls.localize(
+          'arduino/common/offlineIndicator',
+          'You appear to be offline. Without an Internet connection, the Arduino CLI might not be able to download the required resources and could cause malfunction. Please connect to the Internet and restart the application.'
+        )
+      );
+    }
+  }
 
-    // Unused but do not remove it. It's required by DI, otherwise `init` method is not called.
-    @inject(BoardsServiceClient)
-    protected readonly boardsServiceClient: BoardsServiceClient;
-
-    @inject(SelectionService)
-    protected readonly selectionService: SelectionService;
-
-    @inject(EditorManager)
-    protected readonly editorManager: EditorManager;
-
-    @inject(ContextMenuRenderer)
-    protected readonly contextMenuRenderer: ContextMenuRenderer;
-
-    @inject(FileDialogService)
-    protected readonly fileDialogService: FileDialogService;
-
-    @inject(FileSystem)
-    protected readonly fileSystem: FileSystem;
-
-    @inject(SketchesService)
-    protected readonly sketchService: SketchesService;
-
-    @inject(BoardsConfigDialog)
-    protected readonly boardsConfigDialog: BoardsConfigDialog;
-
-    @inject(MenuModelRegistry)
-    protected readonly menuRegistry: MenuModelRegistry;
-
-    @inject(CommandRegistry)
-    protected readonly commandRegistry: CommandRegistry;
-
-    @inject(StatusBar)
-    protected readonly statusBar: StatusBar;
-
-    @inject(WorkspaceService)
-    protected readonly workspaceService: WorkspaceService;
-
-    @inject(MonitorConnection)
-    protected readonly monitorConnection: MonitorConnection;
-
-    @inject(FileNavigatorContribution)
-    protected readonly fileNavigatorContributions: FileNavigatorContribution;
-
-    @inject(OutputContribution)
-    protected readonly outputContribution: OutputContribution;
-
-    @inject(OutlineViewContribution)
-    protected readonly outlineContribution: OutlineViewContribution;
-
-    @inject(ProblemContribution)
-    protected readonly problemContribution: ProblemContribution;
-
-    @inject(ScmContribution)
-    protected readonly scmContribution: ScmContribution;
-
-    @inject(SearchInWorkspaceFrontendContribution)
-    protected readonly siwContribution: SearchInWorkspaceFrontendContribution;
-
-    @inject(EditorMode)
-    protected readonly editorMode: EditorMode;
-
-    @inject(ArduinoDaemon)
-    protected readonly daemon: ArduinoDaemon;
-
-    @inject(OpenerService)
-    protected readonly openerService: OpenerService;
-
-    @inject(ConfigService)
-    protected readonly configService: ConfigService;
-
-    @inject(BoardsDataStore)
-    protected readonly boardsDataStore: BoardsDataStore;
-
-    @inject(MainMenuManager)
-    protected readonly mainMenuManager: MainMenuManager;
-
-    @inject(FileSystemExt)
-    protected readonly fileSystemExt: FileSystemExt;
-
-    @postConstruct()
-    protected async init(): Promise<void> {
-        if (!window.navigator.onLine) {
-            // tslint:disable-next-line:max-line-length
-            this.messageService.warn('You appear to be offline. Without an Internet connection, the Arduino CLI might not be able to download the required resources and could cause malfunction. Please connect to the Internet and restart the application.');
+  onStart(app: FrontendApplication): void {
+    this.arduinoPreferences.onPreferenceChanged((event) => {
+      if (event.newValue !== event.oldValue) {
+        switch (event.preferenceName) {
+          case 'arduino.window.zoomLevel':
+            if (typeof event.newValue === 'number') {
+              const webContents = remote.getCurrentWebContents();
+              webContents.setZoomLevel(event.newValue || 0);
+            }
+            break;
         }
-        const updateStatusBar = ({ selectedBoard, selectedPort }: BoardsConfig.Config) => {
-            this.statusBar.setElement('arduino-selected-board', {
-                alignment: StatusBarAlignment.RIGHT,
-                text: selectedBoard ? `$(microchip) ${selectedBoard.name}` : '$(close) no board selected',
-                className: 'arduino-selected-board'
-            });
-            if (selectedBoard) {
-                this.statusBar.setElement('arduino-selected-port', {
-                    alignment: StatusBarAlignment.RIGHT,
-                    text: selectedPort ? `on ${Port.toString(selectedPort)}` : '[not connected]',
-                    className: 'arduino-selected-port'
-                });
-            }
-        }
-        this.boardsServiceClientImpl.onBoardsConfigChanged(updateStatusBar);
-        updateStatusBar(this.boardsServiceClientImpl.boardsConfig);
-    }
-
-    onStart(app: FrontendApplication): void {
-        // Initialize all `pro-mode` widgets. This is a NOOP if in normal mode.
-        for (const viewContribution of [
-            this.fileNavigatorContributions,
-            this.outputContribution,
-            this.outlineContribution,
-            this.problemContribution,
-            this.scmContribution,
-            this.siwContribution] as Array<FrontendApplicationContribution>) {
-            if (viewContribution.initializeLayout) {
-                viewContribution.initializeLayout(app);
-            }
-        }
-    }
-
-    registerToolbarItems(registry: TabBarToolbarRegistry): void {
-        registry.registerItem({
-            id: BoardsToolBarItem.TOOLBAR_ID,
-            render: () => <BoardsToolBarItem
-                key='boardsToolbarItem'
-                commands={this.commandRegistry}
-                boardsServiceClient={this.boardsServiceClientImpl} />,
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
-            priority: 7
-        });
-        registry.registerItem({
-            id: 'toggle-serial-monitor',
-            command: MonitorViewContribution.TOGGLE_SERIAL_MONITOR_TOOLBAR,
-            tooltip: 'Serial Monitor'
-        });
-        registry.registerItem({
-            id: ArduinoCommands.TOGGLE_ADVANCED_MODE.id,
-            command: ArduinoCommands.TOGGLE_ADVANCED_MODE_TOOLBAR.id,
-            tooltip: this.editorMode.proMode ? 'Switch to Classic Mode' : 'Switch to Advanced Mode',
-            text: this.editorMode.proMode ? '$(toggle-on)' : '$(toggle-off)'
-        });
-    }
-
-    registerCommands(registry: CommandRegistry): void {
-        registry.registerCommand(ArduinoCommands.TOGGLE_COMPILE_FOR_DEBUG, {
-            execute: () => this.editorMode.toggleCompileForDebug(),
-            isToggled: () => this.editorMode.compileForDebug
-        });
-        registry.registerCommand(ArduinoCommands.OPEN_SKETCH_FILES, {
-            execute: async (uri: string) => {
-                this.openSketchFiles(uri);
-            }
-        });
-        registry.registerCommand(ArduinoCommands.OPEN_BOARDS_DIALOG, {
-            execute: async () => {
-                const boardsConfig = await this.boardsConfigDialog.open();
-                if (boardsConfig) {
-                    this.boardsServiceClientImpl.boardsConfig = boardsConfig;
-                }
-            }
-        });
-        registry.registerCommand(ArduinoCommands.TOGGLE_ADVANCED_MODE, {
-            isToggled: () => this.editorMode.proMode,
-            execute: () => this.editorMode.toggleProMode()
-        });
-        registry.registerCommand(ArduinoCommands.TOGGLE_ADVANCED_MODE_TOOLBAR, {
-            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'right',
-            isToggled: () => this.editorMode.proMode,
-            execute: () => this.editorMode.toggleProMode()
-        });
-    }
-
-    registerMenus(registry: MenuModelRegistry) {
-        if (!this.editorMode.proMode) {
-            const menuId = (menuPath: string[]): string => {
-                const index = menuPath.length - 1;
-                const menuId = menuPath[index];
-                return menuId;
-            }
-            registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(MonacoMenus.SELECTION));
-            registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(EditorMainMenu.GO));
-            registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(TerminalMenus.TERMINAL));
-            registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(CommonMenus.VIEW));
-        }
-        registry.registerSubmenu(ArduinoMenus.SKETCH, 'Sketch');
-        registry.registerSubmenu(ArduinoMenus.TOOLS, 'Tools');
-        registry.registerMenuAction(ArduinoMenus.SKETCH, {
-            commandId: ArduinoCommands.TOGGLE_COMPILE_FOR_DEBUG.id,
-            label: 'Optimize for Debugging',
-            order: '1'
-        });
-        registry.registerMenuAction(CommonMenus.HELP, {
-            commandId: ArduinoCommands.TOGGLE_ADVANCED_MODE.id,
-            label: 'Advanced Mode'
-        });
-    }
-
-    protected async openSketchFiles(uri: string): Promise<void> {
-        try {
-            const sketch = await this.sketchService.loadSketch(uri);
-            const { mainFileUri, otherSketchFileUris, additionalFileUris } = sketch;
-            for (const uri of [mainFileUri, ...otherSketchFileUris, ...additionalFileUris]) {
-                await this.ensureOpened(uri);
-            }
-            await this.ensureOpened(mainFileUri, true);
-        } catch (e) {
-            console.error(e);
-            const message = e instanceof Error ? e.message : JSON.stringify(e);
-            this.messageService.error(message);
-        }
-    }
-
-    protected async ensureOpened(uri: string, forceOpen: boolean = false): Promise<any> {
-        const widget = this.editorManager.all.find(widget => widget.editor.uri.toString() === uri);
-        if (!widget || forceOpen) {
-            return this.editorManager.open(new URI(uri));
-        }
-    }
-
-    registerColors(colors: ColorRegistry): void {
-        colors.register(
-            {
-                id: 'arduino.branding.primary',
-                defaults: {
-                    dark: 'statusBar.background',
-                    light: 'statusBar.background'
-                },
-                description: 'The primary branding color, such as dialog titles, library, and board manager list labels.'
-            },
-            {
-                id: 'arduino.branding.secondary',
-                defaults: {
-                    dark: 'statusBar.background',
-                    light: 'statusBar.background'
-                },
-                description: 'Secondary branding color for list selections, dropdowns, and widget borders.'
-            },
-            {
-                id: 'arduino.foreground',
-                defaults: {
-                    dark: 'editorWidget.background',
-                    light: 'editorWidget.background',
-                    hc: 'editorWidget.background'
-                },
-                description: 'Color of the Arduino Pro IDE foreground which is used for dialogs, such as the Select Board dialog.'
-            },
-            {
-                id: 'arduino.toolbar.background',
-                defaults: {
-                    dark: 'button.background',
-                    light: 'button.background',
-                    hc: 'activityBar.inactiveForeground'
-                },
-                description: 'Background color of the toolbar items. Such as Upload, Verify, etc.'
-            },
-            {
-                id: 'arduino.toolbar.hoverBackground',
-                defaults: {
-                    dark: 'button.hoverBackground',
-                    light: 'button.hoverBackground',
-                    hc: 'activityBar.inactiveForeground'
-                },
-                description: 'Background color of the toolbar items when hovering over them. Such as Upload, Verify, etc.'
-            },
-            {
-                id: 'arduino.output.foreground',
-                defaults: {
-                    dark: 'editor.foreground',
-                    light: 'editor.foreground',
-                    hc: 'editor.foreground'
-                },
-                description: 'Color of the text in the Output view.'
-            },
-            {
-                id: 'arduino.output.background',
-                defaults: {
-                    dark: 'editor.background',
-                    light: 'editor.background',
-                    hc: 'editor.background'
-                },
-                description: 'Background color of the Output view.'
-            }
+      }
+    });
+    this.appStateService.reachedState('ready').then(() =>
+      this.arduinoPreferences.ready.then(() => {
+        const webContents = remote.getCurrentWebContents();
+        const zoomLevel = this.arduinoPreferences.get(
+          'arduino.window.zoomLevel'
         );
-    }
+        webContents.setZoomLevel(zoomLevel);
+      })
+    );
+    // Removes the _Settings_ (cog) icon from the left sidebar
+    app.shell.leftPanelHandler.removeBottomMenu('settings-menu');
+  }
 
+  registerToolbarItems(registry: TabBarToolbarRegistry): void {
+    registry.registerItem({
+      id: BoardsToolBarItem.TOOLBAR_ID,
+      render: () => (
+        <BoardsToolBarItem
+          key="boardsToolbarItem"
+          commands={this.commandRegistry}
+          boardsServiceProvider={this.boardsServiceProvider}
+        />
+      ),
+      isVisible: (widget) =>
+        ArduinoToolbar.is(widget) && widget.side === 'left',
+      priority: 7,
+    });
+    registry.registerItem({
+      id: 'toggle-serial-plotter',
+      command: SerialPlotterContribution.Commands.OPEN_TOOLBAR.id,
+      tooltip: nls.localize(
+        'arduino/serial/openSerialPlotter',
+        'Serial Plotter'
+      ),
+    });
+    registry.registerItem({
+      id: 'toggle-serial-monitor',
+      command: MonitorViewContribution.TOGGLE_SERIAL_MONITOR_TOOLBAR,
+      tooltip: nls.localize('arduino/common/serialMonitor', 'Serial Monitor'),
+    });
+  }
+
+  registerCommands(registry: CommandRegistry): void {
+    for (const command of [
+      EditorCommands.SPLIT_EDITOR_DOWN,
+      EditorCommands.SPLIT_EDITOR_LEFT,
+      EditorCommands.SPLIT_EDITOR_RIGHT,
+      EditorCommands.SPLIT_EDITOR_UP,
+      EditorCommands.SPLIT_EDITOR_VERTICAL,
+      EditorCommands.SPLIT_EDITOR_HORIZONTAL,
+      FileNavigatorCommands.REVEAL_IN_NAVIGATOR,
+    ]) {
+      registry.unregisterCommand(command);
+    }
+  }
+
+  registerMenus(registry: MenuModelRegistry): void {
+    const menuId = (menuPath: string[]): string => {
+      const index = menuPath.length - 1;
+      const menuId = menuPath[index];
+      return menuId;
+    };
+    registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(MonacoMenus.SELECTION));
+    registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(EditorMainMenu.GO));
+    registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(TerminalMenus.TERMINAL));
+    registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(CommonMenus.VIEW));
+
+    registry.registerSubmenu(
+      ArduinoMenus.SKETCH,
+      nls.localize('arduino/menu/sketch', 'Sketch')
+    );
+    registry.registerSubmenu(
+      ArduinoMenus.TOOLS,
+      nls.localize('arduino/menu/tools', 'Tools')
+    );
+  }
+
+  registerColors(colors: ColorRegistry): void {
+    colors.register(
+      {
+        id: 'arduino.toolbar.button.background',
+        defaults: {
+          dark: 'button.background',
+          light: 'button.background',
+          hc: 'activityBar.inactiveForeground',
+        },
+        description:
+          'Background color of the toolbar items. Such as Upload, Verify, etc.',
+      },
+      {
+        id: 'arduino.toolbar.button.hoverBackground',
+        defaults: {
+          dark: 'button.hoverBackground',
+          light: 'button.hoverBackground',
+          hc: 'button.background',
+        },
+        description:
+          'Background color of the toolbar items when hovering over them. Such as Upload, Verify, etc.',
+      },
+      {
+        id: 'arduino.toolbar.button.secondary.label',
+        defaults: {
+          dark: 'secondaryButton.foreground',
+          light: 'button.foreground',
+          hc: 'activityBar.inactiveForeground',
+        },
+        description:
+          'Foreground color of the toolbar items. Such as Serial Monitor and Serial Plotter',
+      },
+      {
+        id: 'arduino.toolbar.button.secondary.hoverBackground',
+        defaults: {
+          dark: 'secondaryButton.hoverBackground',
+          light: 'button.hoverBackground',
+          hc: 'textLink.foreground',
+        },
+        description:
+          'Background color of the toolbar items when hovering over them, such as "Serial Monitor" and "Serial Plotter"',
+      },
+      {
+        id: 'arduino.toolbar.toggleBackground',
+        defaults: {
+          dark: 'editor.selectionBackground',
+          light: 'editor.selectionBackground',
+          hc: 'textPreformat.foreground',
+        },
+        description:
+          'Toggle color of the toolbar items when they are currently toggled (the command is in progress)',
+      },
+      {
+        id: 'arduino.toolbar.dropdown.border',
+        defaults: {
+          dark: 'dropdown.border',
+          light: 'dropdown.border',
+          hc: 'dropdown.border',
+        },
+        description: 'Border color of the Board Selector.',
+      },
+
+      {
+        id: 'arduino.toolbar.dropdown.borderActive',
+        defaults: {
+          dark: 'focusBorder',
+          light: 'focusBorder',
+          hc: 'focusBorder',
+        },
+        description: "Border color of the Board Selector when it's active",
+      },
+
+      {
+        id: 'arduino.toolbar.dropdown.background',
+        defaults: {
+          dark: 'tab.unfocusedActiveBackground',
+          light: 'dropdown.background',
+          hc: 'dropdown.background',
+        },
+        description: 'Background color of the Board Selector.',
+      },
+
+      {
+        id: 'arduino.toolbar.dropdown.label',
+        defaults: {
+          dark: 'dropdown.foreground',
+          light: 'dropdown.foreground',
+          hc: 'dropdown.foreground',
+        },
+        description: 'Font color of the Board Selector.',
+      },
+      {
+        id: 'arduino.toolbar.dropdown.iconSelected',
+        defaults: {
+          dark: 'list.activeSelectionIconForeground',
+          light: 'list.activeSelectionIconForeground',
+          hc: 'list.activeSelectionIconForeground',
+        },
+        description:
+          'Color of the selected protocol icon in the Board Selector.',
+      },
+      {
+        id: 'arduino.toolbar.dropdown.option.backgroundHover',
+        defaults: {
+          dark: 'list.hoverBackground',
+          light: 'list.hoverBackground',
+          hc: 'list.hoverBackground',
+        },
+        description: 'Background color on hover of the Board Selector options.',
+      },
+      {
+        id: 'arduino.toolbar.dropdown.option.backgroundSelected',
+        defaults: {
+          dark: 'list.activeSelectionBackground',
+          light: 'list.activeSelectionBackground',
+          hc: 'list.activeSelectionBackground',
+        },
+        description:
+          'Background color of the selected board in the Board Selector.',
+      }
+    );
+  }
 }

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

@@ -0,0 +1,304 @@
+import { interfaces } from '@theia/core/shared/inversify';
+import {
+  createPreferenceProxy,
+  PreferenceProxy,
+  PreferenceService,
+  PreferenceContribution,
+  PreferenceSchema,
+} from '@theia/core/lib/browser/preferences';
+import { nls } from '@theia/core/lib/common';
+import { CompilerWarningLiterals, CompilerWarnings } from '../common/protocol';
+
+export enum UpdateChannel {
+  Stable = 'stable',
+  Nightly = 'nightly',
+}
+export const ErrorRevealStrategyLiterals = [
+  /**
+   * Scroll vertically as necessary and reveal a line.
+   */
+  'auto',
+  /**
+   * Scroll vertically as necessary and reveal a line centered vertically.
+   */
+  'center',
+  /**
+   * Scroll vertically as necessary and reveal a line close to the top of the viewport, optimized for viewing a code definition.
+   */
+  'top',
+  /**
+   * Scroll vertically as necessary and reveal a line centered vertically only if it lies outside the viewport.
+   */
+  'centerIfOutsideViewport',
+] as const;
+export type ErrorRevealStrategy = typeof ErrorRevealStrategyLiterals[number];
+export namespace ErrorRevealStrategy {
+  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
+  export function is(arg: any): arg is ErrorRevealStrategy {
+    return !!arg && ErrorRevealStrategyLiterals.includes(arg);
+  }
+  export const Default: ErrorRevealStrategy = 'centerIfOutsideViewport';
+}
+
+export const ArduinoConfigSchema: PreferenceSchema = {
+  type: 'object',
+  properties: {
+    'arduino.language.log': {
+      type: 'boolean',
+      description: nls.localize(
+        'arduino/preferences/language.log',
+        "True if the Arduino Language Server should generate log files into the sketch folder. Otherwise, false. It's false by default."
+      ),
+      default: false,
+    },
+    'arduino.language.realTimeDiagnostics': {
+      type: 'boolean',
+      description: nls.localize(
+        'arduino/preferences/language.realTimeDiagnostics',
+        "If true, the language server provides real-time diagnostics when typing in the editor. It's false by default."
+      ),
+      default: false,
+    },
+    'arduino.compile.verbose': {
+      type: 'boolean',
+      description: nls.localize(
+        'arduino/preferences/compile.verbose',
+        'True for verbose compile output. False by default'
+      ),
+      default: false,
+    },
+    'arduino.compile.experimental': {
+      type: 'boolean',
+      description: nls.localize(
+        'arduino/preferences/compile.experimental',
+        'True if the IDE should handle multiple compiler errors. False by default'
+      ),
+      default: false,
+    },
+    'arduino.compile.revealRange': {
+      enum: [...ErrorRevealStrategyLiterals],
+      description: nls.localize(
+        'arduino/preferences/compile.revealRange',
+        "Adjusts how compiler errors are revealed in the editor after a failed verify/upload. Possible values: 'auto': Scroll vertically as necessary and reveal a line. 'center': Scroll vertically as necessary and reveal a line centered vertically. 'top': Scroll vertically as necessary and reveal a line close to the top of the viewport, optimized for viewing a code definition. 'centerIfOutsideViewport': Scroll vertically as necessary and reveal a line centered vertically only if it lies outside the viewport. The default value is '{0}'.",
+        ErrorRevealStrategy.Default
+      ),
+      default: ErrorRevealStrategy.Default,
+    },
+    'arduino.compile.warnings': {
+      enum: [...CompilerWarningLiterals],
+      description: nls.localize(
+        'arduino/preferences/compile.warnings',
+        "Tells gcc which warning level to use. It's 'None' by default"
+      ),
+      default: 'None',
+    },
+    'arduino.upload.verbose': {
+      type: 'boolean',
+      description: nls.localize(
+        'arduino/preferences/upload.verbose',
+        'True for verbose upload output. False by default.'
+      ),
+      default: false,
+    },
+    'arduino.upload.verify': {
+      type: 'boolean',
+      default: false,
+    },
+    'arduino.window.autoScale': {
+      type: 'boolean',
+      description: nls.localize(
+        'arduino/preferences/window.autoScale',
+        'True if the user interface automatically scales with the font size.'
+      ),
+      default: true,
+    },
+    'arduino.window.zoomLevel': {
+      type: 'number',
+      description: nls.localize(
+        'arduino/preferences/window.zoomLevel',
+        'Adjust the zoom level of the window. The original size is 0 and each increment above (e.g. 1) or below (e.g. -1) represents zooming 20% larger or smaller. You can also enter decimals to adjust the zoom level with a finer granularity.'
+      ),
+      default: 0,
+    },
+    'arduino.ide.updateChannel': {
+      type: 'string',
+      enum: Object.values(UpdateChannel) as UpdateChannel[],
+      default: UpdateChannel.Stable,
+      description: nls.localize(
+        'arduino/preferences/ide.updateChannel',
+        "Release channel to get updated from. 'stable' is the stable release, 'nightly' is the latest development build."
+      ),
+    },
+    'arduino.ide.updateBaseUrl': {
+      type: 'string',
+      default: 'https://downloads.arduino.cc/arduino-ide',
+      description: nls.localize(
+        'arduino/preferences/ide.updateBaseUrl',
+        "The base URL where to download updates from. Defaults to 'https://downloads.arduino.cc/arduino-ide'"
+      ),
+    },
+    'arduino.board.certificates': {
+      type: 'string',
+      description: nls.localize(
+        'arduino/preferences/board.certificates',
+        'List of certificates that can be uploaded to boards'
+      ),
+      default: '',
+    },
+    'arduino.sketchbook.showAllFiles': {
+      type: 'boolean',
+      description: nls.localize(
+        'arduino/preferences/sketchbook.showAllFiles',
+        'True to show all sketch files inside the sketch. It is false by default.'
+      ),
+      default: false,
+    },
+    'arduino.cloud.enabled': {
+      type: 'boolean',
+      description: nls.localize(
+        'arduino/preferences/cloud.enabled',
+        'True if the sketch sync functions are enabled. Defaults to true.'
+      ),
+      default: true,
+    },
+    'arduino.cloud.pull.warn': {
+      type: 'boolean',
+      description: nls.localize(
+        'arduino/preferences/cloud.pull.warn',
+        'True if users should be warned before pulling a cloud sketch. Defaults to true.'
+      ),
+      default: true,
+    },
+    'arduino.cloud.push.warn': {
+      type: 'boolean',
+      description: nls.localize(
+        'arduino/preferences/cloud.push.warn',
+        'True if users should be warned before pushing a cloud sketch. Defaults to true.'
+      ),
+      default: true,
+    },
+    'arduino.cloud.pushpublic.warn': {
+      type: 'boolean',
+      description: nls.localize(
+        'arduino/preferences/cloud.pushpublic.warn',
+        'True if users should be warned before pushing a public sketch to the cloud. Defaults to true.'
+      ),
+      default: true,
+    },
+    'arduino.cloud.sketchSyncEndpoint': {
+      type: 'string',
+      description: nls.localize(
+        'arduino/preferences/cloud.sketchSyncEndpoint',
+        'The endpoint used to push and pull sketches from a backend. By default it points to Arduino Cloud API.'
+      ),
+      default: 'https://api2.arduino.cc/create',
+    },
+    'arduino.auth.clientID': {
+      type: 'string',
+      description: nls.localize(
+        'arduino/preferences/auth.clientID',
+        'The OAuth2 client ID.'
+      ),
+      default: 'C34Ya6ex77jTNxyKWj01lCe1vAHIaPIo',
+    },
+    'arduino.auth.domain': {
+      type: 'string',
+      description: nls.localize(
+        'arduino/preferences/auth.domain',
+        'The OAuth2 domain.'
+      ),
+      default: 'login.arduino.cc',
+    },
+    'arduino.auth.audience': {
+      type: 'string',
+      description: nls.localize(
+        'arduino/preferences/auth.audience',
+        'The OAuth2 audience.'
+      ),
+      default: 'https://api.arduino.cc',
+    },
+    'arduino.auth.registerUri': {
+      type: 'string',
+      description: nls.localize(
+        'arduino/preferences/auth.registerUri',
+        'The URI used to register a new user.'
+      ),
+      default: 'https://auth.arduino.cc/login#/register',
+    },
+    'arduino.survey.notification': {
+      type: 'boolean',
+      description: nls.localize(
+        'arduino/preferences/survey.notification',
+        'True if users should be notified if a survey is available. True by default.'
+      ),
+      default: true,
+    },
+    'arduino.cli.daemon.debug': {
+      type: 'boolean',
+      description: nls.localize(
+        'arduino/preferences/cli.daemonDebug',
+        "Enable debug logging of the gRPC calls to the Arduino CLI. A restart of the IDE is needed for this setting to take effect. It's false by default."
+      ),
+      default: false,
+    },
+    'arduino.checkForUpdates': {
+      type: 'boolean',
+      description: nls.localize(
+        'arduino/preferences/checkForUpdate',
+        "Receive notifications of available updates for the IDE, boards, and libraries. Requires an IDE restart after change. It's true by default."
+      ),
+      default: true,
+    },
+    'arduino.sketch.inoBlueprint': {
+      type: 'string',
+      markdownDescription: nls.localize(
+        'arduino/preferences/sketch/inoBlueprint',
+        'Absolute filesystem path to the default `.ino` blueprint file. If specified, the content of the blueprint file will be used for every new sketch created by the IDE. The sketches will be generated with the default Arduino content if not specified. Unaccessible blueprint files are ignored. **A restart of the IDE is needed** for this setting to take effect.'
+      ),
+      default: undefined,
+    },
+  },
+};
+
+export interface ArduinoConfiguration {
+  'arduino.language.log': boolean;
+  'arduino.language.realTimeDiagnostics': boolean;
+  'arduino.compile.verbose': boolean;
+  'arduino.compile.experimental': boolean;
+  'arduino.compile.revealRange': ErrorRevealStrategy;
+  'arduino.compile.warnings': CompilerWarnings;
+  'arduino.upload.verbose': boolean;
+  'arduino.upload.verify': boolean;
+  'arduino.window.autoScale': boolean;
+  'arduino.window.zoomLevel': number;
+  'arduino.ide.updateChannel': UpdateChannel;
+  'arduino.ide.updateBaseUrl': string;
+  'arduino.board.certificates': string;
+  'arduino.sketchbook.showAllFiles': boolean;
+  'arduino.cloud.enabled': boolean;
+  'arduino.cloud.pull.warn': boolean;
+  'arduino.cloud.push.warn': boolean;
+  'arduino.cloud.pushpublic.warn': boolean;
+  'arduino.cloud.sketchSyncEndpoint': string;
+  'arduino.auth.clientID': string;
+  'arduino.auth.domain': string;
+  'arduino.auth.audience': string;
+  'arduino.auth.registerUri': string;
+  'arduino.survey.notification': boolean;
+  'arduino.cli.daemon.debug': boolean;
+  'arduino.sketch.inoBlueprint': string;
+  'arduino.checkForUpdates': boolean;
+}
+
+export const ArduinoPreferences = Symbol('ArduinoPreferences');
+export type ArduinoPreferences = PreferenceProxy<ArduinoConfiguration>;
+
+export function bindArduinoPreferences(bind: interfaces.Bind): void {
+  bind(ArduinoPreferences).toDynamicValue((ctx) => {
+    const preferences = ctx.container.get<PreferenceService>(PreferenceService);
+    return createPreferenceProxy(preferences, ArduinoConfigSchema);
+  });
+  bind(PreferenceContribution).toConstantValue({
+    schema: ArduinoConfigSchema,
+  });
+}

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

@@ -1,5 +1,4 @@
-import { toUnix } from 'upath';
-import URI from '@theia/core/lib/common/uri';
+import { URI } from '@theia/core/shared/vscode-uri';
 import { isWindows } from '@theia/core/lib/common/os';
 import { notEmpty } from '@theia/core/lib/common/objects';
 import { MaybePromise } from '@theia/core/lib/common/types';
@@ -7,7 +6,7 @@ import { MaybePromise } from '@theia/core/lib/common/types';
 /**
  * Class for determining the default workspace location from the
  * `location.hash`, the historical workspace locations, and recent sketch files.
- * 
+ *
  * The following logic is used for determining the default workspace location:
  * - `hash` points to an existing location?
  *  - Yes
@@ -20,49 +19,50 @@ import { MaybePromise } from '@theia/core/lib/common/types';
  *   - `try open recent workspace roots`, then `try open last modified sketches`, finally `create new sketch`.
  */
 namespace ArduinoWorkspaceRootResolver {
-    export interface InitOptions {
-        readonly isValid: (uri: string) => MaybePromise<boolean>;
-    }
-    export interface ResolveOptions {
-        readonly hash?: string
-        readonly recentWorkspaces: string[];
-        // Gathered from the default sketch folder. The default sketch folder is defined by the CLI.
-        readonly recentSketches: string[];
-    }
+  export interface InitOptions {
+    readonly isValid: (uri: string) => MaybePromise<boolean>;
+  }
+  export interface ResolveOptions {
+    readonly hash?: string;
+    readonly recentWorkspaces: string[];
+    // Gathered from the default sketch folder. The default sketch folder is defined by the CLI.
+    readonly recentSketches: string[];
+  }
 }
 export class ArduinoWorkspaceRootResolver {
+  constructor(protected options: ArduinoWorkspaceRootResolver.InitOptions) {}
 
-    constructor(protected options: ArduinoWorkspaceRootResolver.InitOptions) {
+  async resolve(
+    options: ArduinoWorkspaceRootResolver.ResolveOptions
+  ): Promise<{ uri: string } | undefined> {
+    const { hash, recentWorkspaces, recentSketches } = options;
+    for (const uri of [
+      this.hashToUri(hash),
+      ...recentWorkspaces,
+      ...recentSketches,
+    ].filter(notEmpty)) {
+      const valid = await this.isValid(uri);
+      if (valid) {
+        return { uri };
+      }
     }
+    return undefined;
+  }
 
-    async resolve(options: ArduinoWorkspaceRootResolver.ResolveOptions): Promise<{ uri: string } | undefined> {
-        const { hash, recentWorkspaces, recentSketches } = options;
-        for (const uri of [this.hashToUri(hash), ...recentWorkspaces, ...recentSketches].filter(notEmpty)) {
-            const valid = await this.isValid(uri);
-            if (valid) {
-                return { uri };
-            }
-        }
-        return undefined;
+  protected isValid(uri: string): MaybePromise<boolean> {
+    return this.options.isValid(uri);
+  }
+
+  // Note: here, the `hash` was defined as new `URI(yourValidFsPath).path` so we have to map it to a valid FS path first.
+  // This is important for Windows only and a NOOP on POSIX.
+  // Note: we set the `new URI(myValidUri).path.toString()` as the `hash`. See:
+  // - https://github.com/eclipse-theia/theia/blob/8196e9dcf9c8de8ea0910efeb5334a974f426966/packages/workspace/src/browser/workspace-service.ts#L143 and
+  // - https://github.com/eclipse-theia/theia/blob/8196e9dcf9c8de8ea0910efeb5334a974f426966/packages/workspace/src/browser/workspace-service.ts#L423
+  protected hashToUri(hash: string | undefined): string | undefined {
+    if (hash && hash.length > 1 && hash.startsWith('#')) {
+      const path = decodeURI(hash.slice(1)).replace(/\\/g, '/'); // Trim the leading `#`, decode the URI and replace Windows separators
+      return URI.file(path.slice(isWindows && hash.startsWith('/') ? 1 : 0)).toString();
     }
-
-    protected isValid(uri: string): MaybePromise<boolean> {
-        return this.options.isValid(uri);
-    }
-
-    // Note: here, the `hash` was defined as new `URI(yourValidFsPath).path` so we have to map it to a valid FS path first.
-    // This is important for Windows only and a NOOP on POSIX.
-    // Note: we set the `new URI(myValidUri).path.toString()` as the `hash`. See:
-    // - https://github.com/eclipse-theia/theia/blob/8196e9dcf9c8de8ea0910efeb5334a974f426966/packages/workspace/src/browser/workspace-service.ts#L143 and
-    // - https://github.com/eclipse-theia/theia/blob/8196e9dcf9c8de8ea0910efeb5334a974f426966/packages/workspace/src/browser/workspace-service.ts#L423
-    protected hashToUri(hash: string | undefined): string | undefined {
-        if (hash
-            && hash.length > 1
-            && hash.startsWith('#')) {
-            const path = hash.slice(1); // Trim the leading `#`.
-            return new URI(toUnix(path.slice(isWindows && hash.startsWith('/') ? 1 : 0))).withScheme('file').toString();
-        }
-        return undefined;
-    }
-
+    return undefined;
+  }
 }

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

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

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

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

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

@@ -1,62 +1,281 @@
-import { injectable, inject } from 'inversify';
+import { injectable, inject } from '@theia/core/shared/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,
+  Board,
+  Port,
+} from '../../common/protocol/boards-service';
+import { BoardsServiceProvider } from './boards-service-provider';
+import { Installable, ResponseServiceClient } from '../../common/protocol';
 import { BoardsListWidgetFrontendContribution } from './boards-widget-frontend-contribution';
-import { InstallationProgressDialog } from '../widgets/progress-dialog';
-import { BoardsConfig } from './boards-config';
+import { nls } from '@theia/core/lib/common';
+import { NotificationCenter } from '../notification-center';
+import { InstallManually } from '../../common/nls';
+
+interface AutoInstallPromptAction {
+  // isAcceptance, whether or not the action indicates acceptance of auto-install proposal
+  isAcceptance?: boolean;
+  key: string;
+  handler: (...args: unknown[]) => unknown;
+}
+
+type AutoInstallPromptActions = AutoInstallPromptAction[];
 
 /**
  * Listens on `BoardsConfig.Config` changes, if a board is selected which does not
  * have the corresponding core installed, it proposes the user to install the core.
  */
+
+// * Cases in which we do not show the auto-install prompt:
+// 1. When a related platform is already installed
+// 2. When a prompt is already showing in the UI
+// 3. When a board is unplugged
 @injectable()
 export class BoardsAutoInstaller implements FrontendApplicationContribution {
+  @inject(NotificationCenter)
+  private readonly notificationCenter: NotificationCenter;
 
-    @inject(MessageService)
-    protected readonly messageService: MessageService;
+  @inject(MessageService)
+  protected readonly messageService: MessageService;
 
-    @inject(BoardsService)
-    protected readonly boardsService: BoardsService;
+  @inject(BoardsService)
+  protected readonly boardsService: BoardsService;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+  @inject(BoardsServiceProvider)
+  protected readonly boardsServiceClient: BoardsServiceProvider;
 
-    @inject(BoardsListWidgetFrontendContribution)
-    protected readonly boardsManagerFrontendContribution: BoardsListWidgetFrontendContribution;
+  @inject(ResponseServiceClient)
+  protected readonly responseService: ResponseServiceClient;
 
-    onStart(): void {
-        this.boardsServiceClient.onBoardsConfigChanged(this.ensureCoreExists.bind(this));
-        this.ensureCoreExists(this.boardsServiceClient.boardsConfig);
-    }
+  @inject(BoardsListWidgetFrontendContribution)
+  protected readonly boardsManagerFrontendContribution: BoardsListWidgetFrontendContribution;
 
-    protected ensureCoreExists(config: BoardsConfig.Config): void {
-        const { selectedBoard } = config;
-        if (selectedBoard) {
-            this.boardsService.search({}).then(packages => {
-                const candidates = packages
-                    .filter(pkg => pkg.boards.some(board => Board.sameAs(board, selectedBoard)))
-                    .filter(({ installable, installedVersion }) => installable && !installedVersion);
-                for (const candidate of candidates) {
-                    // tslint:disable-next-line:max-line-length
-                    this.messageService.info(`The \`"${candidate.name}"\` core has to be installed for the currently selected \`"${selectedBoard.name}"\` board. Do you want to install it now?`, 'Install Manually', 'Yes').then(async answer => {
-                        if (answer === 'Yes') {
-                            const dialog = new InstallationProgressDialog(candidate.name, candidate.availableVersions[0]);
-                            dialog.open();
-                            try {
-                                await this.boardsService.install({ item: candidate });
-                            } finally {
-                                dialog.close();
-                            }
-                        }
-                        if (answer) {
-                            this.boardsManagerFrontendContribution.openView({ reveal: true }).then(widget => widget.refresh(candidate.name.toLocaleLowerCase()));
-                        }
-                    });
-                }
-            })
+  // Workaround for https://github.com/eclipse-theia/theia/issues/9349
+  protected notifications: Board[] = [];
+
+  // * "refusal" meaning a "prompt action" not accepting the auto-install offer ("X" or "install manually")
+  // we can use "portSelectedOnLastRefusal" to deduce when a board is unplugged after a user has "refused"
+  // an auto-install prompt. Important to know as we do not want "an unplug" to trigger a "refused" prompt
+  // showing again
+  private portSelectedOnLastRefusal: Port | undefined;
+  private lastRefusedPackageId: string | undefined;
+
+  onStart(): void {
+    const setEventListeners = () => {
+      this.boardsServiceClient.onBoardsConfigChanged((config) => {
+        const { selectedBoard, selectedPort } = config;
+
+        const boardWasUnplugged =
+          !selectedPort && this.portSelectedOnLastRefusal;
+
+        this.clearLastRefusedPromptInfo();
+
+        if (
+          boardWasUnplugged ||
+          !selectedBoard ||
+          this.promptAlreadyShowingForBoard(selectedBoard)
+        ) {
+          return;
         }
+
+        this.ensureCoreExists(selectedBoard, selectedPort);
+      });
+
+      // we "clearRefusedPackageInfo" if a "refused" package is eventually
+      // installed, though this is not strictly necessary. It's more of a
+      // cleanup, to ensure the related variables are representative of
+      // current state.
+      this.notificationCenter.onPlatformDidInstall((installed) => {
+        if (this.lastRefusedPackageId === installed.item.id) {
+          this.clearLastRefusedPromptInfo();
+        }
+      });
+    };
+
+    // we should invoke this.ensureCoreExists only once we're sure
+    // everything has been reconciled
+    this.boardsServiceClient.reconciled.then(() => {
+      const { selectedBoard, selectedPort } =
+        this.boardsServiceClient.boardsConfig;
+
+      if (selectedBoard) {
+        this.ensureCoreExists(selectedBoard, selectedPort);
+      }
+
+      setEventListeners();
+    });
+  }
+
+  private removeNotificationByBoard(selectedBoard: Board): void {
+    const index = this.notifications.findIndex((notification) =>
+      Board.sameAs(notification, selectedBoard)
+    );
+    if (index !== -1) {
+      this.notifications.splice(index, 1);
+    }
+  }
+
+  private clearLastRefusedPromptInfo(): void {
+    this.lastRefusedPackageId = undefined;
+    this.portSelectedOnLastRefusal = undefined;
+  }
+
+  private setLastRefusedPromptInfo(
+    packageId: string,
+    selectedPort?: Port
+  ): void {
+    this.lastRefusedPackageId = packageId;
+    this.portSelectedOnLastRefusal = selectedPort;
+  }
+
+  private promptAlreadyShowingForBoard(board: Board): boolean {
+    return Boolean(
+      this.notifications.find((notification) =>
+        Board.sameAs(notification, board)
+      )
+    );
+  }
+
+  protected ensureCoreExists(selectedBoard: Board, selectedPort?: Port): void {
+    this.notifications.push(selectedBoard);
+    this.boardsService.search({}).then((packages) => {
+      const candidate = this.getInstallCandidate(packages, selectedBoard);
+
+      if (candidate) {
+        this.showAutoInstallPrompt(candidate, selectedBoard, selectedPort);
+      } else {
+        this.removeNotificationByBoard(selectedBoard);
+      }
+    });
+  }
+
+  private getInstallCandidate(
+    packages: BoardsPackage[],
+    selectedBoard: Board
+  ): BoardsPackage | undefined {
+    // filter packagesForBoard selecting matches from the cli (installed packages)
+    // and matches based on the board name
+    // NOTE: this ensures the Deprecated & new packages are all in the array
+    // so that we can check if any of the valid packages is already installed
+    const packagesForBoard = packages.filter(
+      (pkg) =>
+        BoardsPackage.contains(selectedBoard, pkg) ||
+        pkg.boards.some((board) => board.name === selectedBoard.name)
+    );
+
+    // check if one of the packages for the board is already installed. if so, no hint
+    if (packagesForBoard.some(({ installedVersion }) => !!installedVersion)) {
+      return;
     }
 
+    // filter the installable (not installed) packages,
+    // CLI returns the packages already sorted with the deprecated ones at the end of the list
+    // in order to ensure the new ones are preferred
+    const candidates = packagesForBoard.filter(
+      ({ installable, installedVersion }) => installable && !installedVersion
+    );
+
+    return candidates[0];
+  }
+
+  private showAutoInstallPrompt(
+    candidate: BoardsPackage,
+    selectedBoard: Board,
+    selectedPort?: Port
+  ): void {
+    const candidateName = candidate.name;
+    const version = candidate.availableVersions[0]
+      ? `[v ${candidate.availableVersions[0]}]`
+      : '';
+
+    const info = this.generatePromptInfoText(
+      candidateName,
+      version,
+      selectedBoard.name
+    );
+
+    const actions = this.createPromptActions(candidate);
+
+    const onRefuse = () => {
+      this.setLastRefusedPromptInfo(candidate.id, selectedPort);
+    };
+    const handleAction = this.createOnAnswerHandler(actions, onRefuse);
+
+    const onAnswer = (answer: string) => {
+      this.removeNotificationByBoard(selectedBoard);
+
+      handleAction(answer);
+    };
+
+    this.messageService
+      .info(info, ...actions.map((action) => action.key))
+      .then(onAnswer);
+  }
+
+  private generatePromptInfoText(
+    candidateName: string,
+    version: string,
+    boardName: string
+  ): string {
+    return nls.localize(
+      'arduino/board/installNow',
+      'The "{0} {1}" core has to be installed for the currently selected "{2}" board. Do you want to install it now?',
+      candidateName,
+      version,
+      boardName
+    );
+  }
+
+  private createPromptActions(
+    candidate: BoardsPackage
+  ): AutoInstallPromptActions {
+    const yes = nls.localize('vscode/extensionsUtils/yes', 'Yes');
+
+    const actions: AutoInstallPromptActions = [
+      {
+        key: InstallManually,
+        handler: () => {
+          this.boardsManagerFrontendContribution
+            .openView({ reveal: true })
+            .then((widget) =>
+              widget.refresh({
+                query: candidate.name.toLocaleLowerCase(),
+                type: 'All',
+              })
+            );
+        },
+      },
+      {
+        isAcceptance: true,
+        key: yes,
+        handler: () => {
+          return Installable.installWithProgress({
+            installable: this.boardsService,
+            item: candidate,
+            messageService: this.messageService,
+            responseService: this.responseService,
+            version: candidate.availableVersions[0],
+          });
+        },
+      },
+    ];
+
+    return actions;
+  }
+
+  private createOnAnswerHandler(
+    actions: AutoInstallPromptActions,
+    onRefuse?: () => void
+  ): (answer: string) => void {
+    return (answer) => {
+      const actionToHandle = actions.find((action) => action.key === answer);
+      actionToHandle?.handler();
+
+      if (!actionToHandle?.isAcceptance && onRefuse) {
+        onRefuse();
+      }
+    };
+  }
 }

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

@@ -1,64 +1,71 @@
-import * as React from 'react';
-import { injectable, inject } from 'inversify';
+import * as React from '@theia/core/shared/react';
+import { injectable, inject } from '@theia/core/shared/inversify';
 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 {
+  @inject(BoardsService)
+  protected readonly boardsService: BoardsService;
 
-    @inject(BoardsService)
-    protected readonly boardsService: BoardsService;
+  @inject(BoardsServiceProvider)
+  protected readonly boardsServiceClient: BoardsServiceProvider;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+  @inject(NotificationCenter)
+  protected readonly notificationCenter: NotificationCenter;
 
-    @inject(CoreServiceClientImpl)
-    protected readonly coreServiceClient: CoreServiceClientImpl;
+  protected readonly onFilterTextDidChangeEmitter = new Emitter<string>();
+  protected readonly onBoardConfigChangedEmitter =
+    new Emitter<BoardsConfig.Config>();
+  readonly onBoardConfigChanged = this.onBoardConfigChangedEmitter.event;
 
-    @inject(ArduinoDaemonClientImpl)
-    protected readonly daemonClient: ArduinoDaemonClientImpl;
+  protected focusNode: HTMLElement | undefined;
 
-    protected readonly onBoardConfigChangedEmitter = new Emitter<BoardsConfig.Config>();
-    readonly onBoardConfigChanged = this.onBoardConfigChangedEmitter.event;
+  constructor() {
+    super();
+    this.id = 'select-board-dialog';
+    this.toDispose.pushAll([
+      this.onBoardConfigChangedEmitter,
+      this.onFilterTextDidChangeEmitter,
+    ]);
+  }
 
-    protected focusNode: HTMLElement | undefined;
+  search(query: string): void {
+    this.onFilterTextDidChangeEmitter.fire(query);
+  }
 
-    constructor() {
-        super();
-        this.id = 'select-board-dialog';
+  protected fireConfigChanged = (config: BoardsConfig.Config) => {
+    this.onBoardConfigChangedEmitter.fire(config);
+  };
+
+  protected setFocusNode = (element: HTMLElement | undefined) => {
+    this.focusNode = element;
+  };
+
+  protected render(): React.ReactNode {
+    return (
+      <div className="selectBoardContainer">
+        <BoardsConfig
+          boardsServiceProvider={this.boardsServiceClient}
+          notificationCenter={this.notificationCenter}
+          onConfigChange={this.fireConfigChanged}
+          onFocusNodeSet={this.setFocusNode}
+          onFilteredTextDidChangeEvent={this.onFilterTextDidChangeEmitter.event}
+          onAppStateDidChange={this.notificationCenter.onAppStateDidChange}
+        />
+      </div>
+    );
+  }
+
+  protected override onActivateRequest(msg: Message): void {
+    super.onActivateRequest(msg);
+    if (this.focusNode instanceof HTMLInputElement) {
+      this.focusNode.select();
     }
-
-    protected fireConfigChanged = (config: BoardsConfig.Config) => {
-        this.onBoardConfigChangedEmitter.fire(config);
-    }
-
-    protected setFocusNode = (element: HTMLElement | undefined) => {
-        this.focusNode = element;
-    }
-
-    protected render(): React.ReactNode {
-        return <div className='selectBoardContainer'>
-            <BoardsConfig
-                boardsService={this.boardsService}
-                boardsServiceClient={this.boardsServiceClient}
-                coreServiceClient={this.coreServiceClient}
-                daemonClient={this.daemonClient}
-                onConfigChange={this.fireConfigChanged}
-                onFocusNodeSet={this.setFocusNode} />
-        </div>;
-    }
-
-    protected onActivateRequest(msg: Message): void {
-        super.onActivateRequest(msg);
-        if (this.focusNode instanceof HTMLInputElement) {
-            this.focusNode.select();
-        }
-        (this.focusNode || this.node).focus();
-    }
-
+    (this.focusNode || this.node).focus();
+  }
 }

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

@@ -1,113 +1,142 @@
-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 {
+  injectable,
+  inject,
+  postConstruct,
+} from '@theia/core/shared/inversify';
+import { Message } from '@theia/core/shared/@phosphor/messaging';
+import { DialogProps, Widget, DialogError } from '@theia/core/lib/browser';
+import { AbstractDialog } from '../theia/dialogs/dialogs';
 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';
+import { nls } from '@theia/core/lib/common';
 
 @injectable()
-export class BoardsConfigDialogProps extends DialogProps {
-}
+export class BoardsConfigDialogProps extends DialogProps {}
 
 @injectable()
 export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
+  @inject(BoardsConfigDialogWidget)
+  protected readonly widget: BoardsConfigDialogWidget;
 
-    @inject(BoardsConfigDialogWidget)
-    protected readonly widget: BoardsConfigDialogWidget;
+  @inject(BoardsService)
+  protected readonly boardService: BoardsService;
 
-    @inject(BoardsService)
-    protected readonly boardService: BoardsService;
+  @inject(BoardsServiceProvider)
+  protected readonly boardsServiceClient: BoardsServiceProvider;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+  protected config: BoardsConfig.Config = {};
 
-    protected config: BoardsConfig.Config = {};
+  constructor(
+    @inject(BoardsConfigDialogProps)
+    protected override readonly props: BoardsConfigDialogProps
+  ) {
+    super({ ...props, maxWidth: 500 });
 
-    constructor(@inject(BoardsConfigDialogProps) protected readonly props: BoardsConfigDialogProps) {
-        super(props);
+    this.node.id = 'select-board-dialog-container';
+    this.contentNode.classList.add('select-board-dialog');
+    this.contentNode.appendChild(this.createDescription());
 
-        this.contentNode.classList.add('select-board-dialog');
-        this.contentNode.appendChild(this.createDescription());
+    this.appendCloseButton(
+      nls.localize('vscode/issueMainService/cancel', 'Cancel')
+    );
+    this.appendAcceptButton(nls.localize('vscode/issueMainService/ok', 'OK'));
+  }
 
-        this.appendCloseButton('CANCEL');
-        this.appendAcceptButton('OK');
-    }
-
-    @postConstruct()
-    protected init(): void {
-        this.toDispose.push(this.boardsServiceClient.onBoardsConfigChanged(config => {
-            this.config = config;
-            this.update();
-        }));
-    }
-
-    protected createDescription(): HTMLElement {
-        const head = document.createElement('div');
-        head.classList.add('head');
-
-        const title = document.createElement('div');
-        title.textContent = 'Select Other Board & Port';
-        title.classList.add('title');
-        head.appendChild(title);
-
-        const text = document.createElement('div');
-        text.classList.add('text');
-        head.appendChild(text);
-
-        for (const paragraph of [
-            'Select both a Board and a Port if you want to upload a sketch.',
-            'If you only select a Board you will be able just to compile, but not to upload your sketch.'
-        ]) {
-            const p = document.createElement('p');
-            p.textContent = paragraph;
-            text.appendChild(p);
-        }
-
-        return head;
-    }
-
-    protected onAfterAttach(msg: Message): void {
-        if (this.widget.isAttached) {
-            Widget.detach(this.widget);
-        }
-        Widget.attach(this.widget, this.contentNode);
-        this.toDisposeOnDetach.push(this.widget.onBoardConfigChanged(config => {
-            this.config = config;
-            this.update();
-        }));
-        super.onAfterAttach(msg);
+  @postConstruct()
+  protected init(): void {
+    this.toDispose.push(
+      this.boardsServiceClient.onBoardsConfigChanged((config) => {
+        this.config = config;
         this.update();
+      })
+    );
+  }
+
+  /**
+   * Pass in an empty string if you want to reset the search term. Using `undefined` has no effect.
+   */
+  override 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');
+
+    const text = document.createElement('div');
+    text.classList.add('text');
+    head.appendChild(text);
+
+    for (const paragraph of [
+      nls.localize(
+        'arduino/board/configDialog1',
+        'Select both a Board and a Port if you want to upload a sketch.'
+      ),
+      nls.localize(
+        'arduino/board/configDialog2',
+        'If you only select a Board you will be able to compile, but not to upload your sketch.'
+      ),
+    ]) {
+      const p = document.createElement('div');
+      p.textContent = paragraph;
+      text.appendChild(p);
     }
 
-    protected onUpdateRequest(msg: Message) {
-        super.onUpdateRequest(msg);
-        this.widget.update();
-    }
+    return head;
+  }
 
-    protected onActivateRequest(msg: Message): void {
-        super.onActivateRequest(msg);
-        this.widget.activate();
+  protected override onAfterAttach(msg: Message): void {
+    if (this.widget.isAttached) {
+      Widget.detach(this.widget);
     }
+    Widget.attach(this.widget, this.contentNode);
+    this.toDisposeOnDetach.push(
+      this.widget.onBoardConfigChanged((config) => {
+        this.config = config;
+        this.update();
+      })
+    );
+    super.onAfterAttach(msg);
+    this.update();
+  }
 
-    protected handleEnter(event: KeyboardEvent): boolean | void {
-        if (event.target instanceof HTMLTextAreaElement) {
-            return false;
-        }
+  protected override onUpdateRequest(msg: Message): void {
+    super.onUpdateRequest(msg);
+    this.widget.update();
+  }
+
+  protected override onActivateRequest(msg: Message): void {
+    super.onActivateRequest(msg);
+    this.widget.activate();
+  }
+
+  protected override handleEnter(event: KeyboardEvent): boolean | void {
+    if (event.target instanceof HTMLTextAreaElement) {
+      return false;
     }
+  }
 
-    protected isValid(value: BoardsConfig.Config): DialogError {
-        if (!value.selectedBoard) {
-            if (value.selectedPort) {
-                return 'Please pick a board connected to the port you have selected.';
-            }
-            return false;
-        }
-        return '';
-    }
-
-    get value(): BoardsConfig.Config {
-        return this.config;
+  protected override isValid(value: BoardsConfig.Config): DialogError {
+    if (!value.selectedBoard) {
+      if (value.selectedPort) {
+        return nls.localize(
+          'arduino/board/pleasePickBoard',
+          'Please pick a board connected to the port you have selected.'
+        );
+      }
+      return false;
     }
+    return '';
+  }
 
+  get value(): BoardsConfig.Config {
+    return this.config;
+  }
 }

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

@@ -1,279 +1,434 @@
-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 * as React from '@theia/core/shared/react';
+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,
+  BoardWithPackage,
+} from '../../common/protocol/boards-service';
+import { NotificationCenter } from '../notification-center';
+import {
+  AvailableBoard,
+  BoardsServiceProvider,
+} from './boards-service-provider';
+import { naturalCompare } from '../../common/utils';
+import { nls } from '@theia/core/lib/common';
+import { FrontendApplicationState } from '@theia/core/lib/common/frontend-application-state';
 
 export namespace BoardsConfig {
+  export interface Config {
+    selectedBoard?: Board;
+    selectedPort?: Port;
+  }
 
-    export interface Config {
-        selectedBoard?: Board;
-        selectedPort?: Port;
-    }
-
-    export interface Props {
-        readonly boardsService: BoardsService;
-        readonly boardsServiceClient: BoardsServiceClientImpl;
-        readonly coreServiceClient: CoreServiceClientImpl;
-        readonly daemonClient: ArduinoDaemonClientImpl;
-        readonly onConfigChange: (config: Config) => void;
-        readonly onFocusNodeSet: (element: HTMLElement | undefined) => void;
-    }
-
-    export interface State extends Config {
-        searchResults: Array<Board & { packageName: string }>;
-        knownPorts: Port[];
-        showAllPorts: boolean;
-        query: string;
-    }
+  export interface Props {
+    readonly boardsServiceProvider: BoardsServiceProvider;
+    readonly notificationCenter: NotificationCenter;
+    readonly onConfigChange: (config: Config) => void;
+    readonly onFocusNodeSet: (element: HTMLElement | undefined) => void;
+    readonly onFilteredTextDidChangeEvent: Event<string>;
+    readonly onAppStateDidChange: Event<FrontendApplicationState>;
+  }
 
+  export interface State extends Config {
+    searchResults: Array<BoardWithPackage>;
+    knownPorts: Port[];
+    showAllPorts: boolean;
+    query: string;
+  }
 }
 
 export abstract class Item<T> extends React.Component<{
-    item: T,
-    label: string,
-    selected: boolean,
-    onClick: (item: T) => void,
-    missing?: boolean,
-    details?: string
+  item: T;
+  label: string;
+  selected: boolean;
+  onClick: (item: T) => void;
+  missing?: boolean;
+  details?: string;
 }> {
-
-    render(): React.ReactNode {
-        const { selected, label, missing, details } = this.props;
-        const classNames = ['item'];
-        if (selected) {
-            classNames.push('selected');
-        }
-        if (missing === true) {
-            classNames.push('missing')
-        }
-        return <div onClick={this.onClick} className={classNames.join(' ')} title={`${label}${!details ? '' : details}`}>
-            <div className='label'>
-                {label}
-            </div>
-            {!details ? '' : <div className='details'>{details}</div>}
-            {!selected ? '' : <div className='selected-icon'><i className='fa fa-check' /></div>}
-        </div>;
+  override render(): React.ReactNode {
+    const { selected, label, missing, details } = this.props;
+    const classNames = ['item'];
+    if (selected) {
+      classNames.push('selected');
     }
-
-    protected onClick = () => {
-        this.props.onClick(this.props.item);
+    if (missing === true) {
+      classNames.push('missing');
     }
+    return (
+      <div
+        onClick={this.onClick}
+        className={classNames.join(' ')}
+        title={`${label}${!details ? '' : details}`}
+      >
+        <div className="label">{label}</div>
+        {!details ? '' : <div className="details">{details}</div>}
+        {!selected ? (
+          ''
+        ) : (
+          <div className="selected-icon">
+            <i className="fa fa-check" />
+          </div>
+        )}
+      </div>
+    );
+  }
 
+  protected onClick = () => {
+    this.props.onClick(this.props.item);
+  };
 }
 
-export class BoardsConfig extends React.Component<BoardsConfig.Props, BoardsConfig.State> {
+export class BoardsConfig extends React.Component<
+  BoardsConfig.Props,
+  BoardsConfig.State
+> {
+  protected toDispose = new DisposableCollection();
 
-    protected toDispose = new DisposableCollection();
+  constructor(props: BoardsConfig.Props) {
+    super(props);
 
-    constructor(props: BoardsConfig.Props) {
-        super(props);
+    const { boardsConfig } = props.boardsServiceProvider;
+    this.state = {
+      searchResults: [],
+      knownPorts: [],
+      showAllPorts: false,
+      query: '',
+      ...boardsConfig,
+    };
+  }
 
-        const { boardsConfig } = props.boardsServiceClient;
-        this.state = {
-            searchResults: [],
-            knownPorts: [],
-            showAllPorts: false,
-            query: '',
-            ...boardsConfig
+  override componentDidMount(): void {
+    this.toDispose.pushAll([
+      this.props.onAppStateDidChange((state) => {
+        if (state === 'ready') {
+          this.updateBoards();
+          this.updatePorts(
+            this.props.boardsServiceProvider.availableBoards
+              .map(({ port }) => port)
+              .filter(notEmpty)
+          );
         }
-    }
-
-    componentDidMount() {
-        this.updateBoards();
-        this.props.boardsService.getAvailablePorts().then(ports => this.updatePorts(ports));
-        const { boardsServiceClient, coreServiceClient, daemonClient } = this.props;
-        this.toDispose.pushAll([
-            boardsServiceClient.onAttachedBoardsChanged(event => this.updatePorts(event.newState.ports, AttachedBoardsChangeEvent.diff(event).detached.ports)),
-            boardsServiceClient.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: [] }))
-        ]);
-    }
-
-    componentWillUnmount(): void {
-        this.toDispose.dispose();
-    }
-
-    protected fireConfigChanged() {
-        const { selectedBoard, selectedPort } = this.state;
-        this.props.onConfigChange({ selectedBoard, selectedPort });
-    }
-
-    protected updateBoards = (eventOrQuery: React.ChangeEvent<HTMLInputElement> | string = '') => {
-        const query = (typeof eventOrQuery === 'string'
-            ? eventOrQuery
-            : eventOrQuery.target.value.toLowerCase()
-        ).trim();
-        this.setState({ query });
-        this.queryBoards({ query }).then(searchResults => this.setState({ searchResults }));
-    }
-
-    protected updatePorts = (ports: Port[] = [], removedPorts: Port[] = []) => {
-        this.queryPorts(Promise.resolve(ports)).then(({ knownPorts }) => {
-            let { selectedPort } = this.state;
-            // If the currently selected port is not available anymore, unset the selected port.
-            if (removedPorts.some(port => Port.equals(port, selectedPort))) {
-                selectedPort = undefined;
-            }
-            this.setState({ knownPorts, selectedPort }, () => this.fireConfigChanged());
-        });
-    }
-
-    protected queryBoards = (options: { query?: string } = {}): Promise<Array<Board & { packageName: string }>> => {
-        return this.props.boardsServiceClient.searchBoards(options);
-    }
-
-    protected get availablePorts(): Promise<Port[]> {
-        return this.props.boardsService.getAvailablePorts();
-    }
-
-    protected queryPorts = async (availablePorts: Promise<Port[]> = this.availablePorts) => {
-        const ports = await availablePorts;
-        return { knownPorts: ports.sort(Port.compare) };
-    }
-
-    protected toggleFilterPorts = () => {
-        this.setState({ showAllPorts: !this.state.showAllPorts });
-    }
-
-    protected selectPort = (selectedPort: Port | undefined) => {
-        this.setState({ selectedPort }, () => this.fireConfigChanged());
-    }
-
-    protected selectBoard = (selectedBoard: Board & { packageName: string } | undefined) => {
-        this.setState({ selectedBoard }, () => this.fireConfigChanged());
-    }
-
-    protected focusNodeSet = (element: HTMLElement | null) => {
-        this.props.onFocusNodeSet(element || undefined);
-    }
-
-    render(): React.ReactNode {
-        return <div className='body'>
-            {this.renderContainer('boards', this.renderBoards.bind(this))}
-            {this.renderContainer('ports', this.renderPorts.bind(this), this.renderPortsFooter.bind(this))}
-        </div>;
-    }
-
-    protected renderContainer(title: string, contentRenderer: () => React.ReactNode, footerRenderer?: () => React.ReactNode): React.ReactNode {
-        return <div className='container'>
-            <div className='content'>
-                <div className='title'>
-                    {title}
-                </div>
-                {contentRenderer()}
-                <div className='footer'>
-                    {(footerRenderer ? footerRenderer() : '')}
-                </div>
-            </div>
-        </div>;
-    }
-
-    protected renderBoards(): React.ReactNode {
-        const { selectedBoard, searchResults } = this.state;
-        // Board names are not unique per core https://github.com/arduino/arduino-pro-ide/issues/262#issuecomment-661019560
-        // It is tricky when the core is not yet installed, no FQBNs are available.
-        const distinctBoards = new Map<string, Board.Detailed>();
-        const toKey = ({ name, packageName, fqbn }: Board.Detailed) => !!fqbn ? `${name}-${packageName}-${fqbn}` : `${name}-${packageName}`;
-        for (const board of Board.decorateBoards(selectedBoard, searchResults)) {
-            const key = toKey(board);
-            if (!distinctBoards.has(key)) {
-                distinctBoards.set(key, board);
-            }
+      }),
+      this.props.boardsServiceProvider.onAvailablePortsChanged(
+        ({ newState, oldState }) => {
+          const removedPorts = oldState.filter(
+            (oldPort) =>
+              !newState.find((newPort) => Port.sameAs(newPort, oldPort))
+          );
+          this.updatePorts(newState, removedPorts);
         }
+      ),
+      this.props.boardsServiceProvider.onBoardsConfigChanged(
+        ({ selectedBoard, selectedPort }) => {
+          this.setState({ selectedBoard, selectedPort }, () =>
+            this.fireConfigChanged()
+          );
+        }
+      ),
+      this.props.notificationCenter.onPlatformDidInstall(() =>
+        this.updateBoards(this.state.query)
+      ),
+      this.props.notificationCenter.onPlatformDidUninstall(() =>
+        this.updateBoards(this.state.query)
+      ),
+      this.props.notificationCenter.onIndexUpdateDidComplete(() =>
+        this.updateBoards(this.state.query)
+      ),
+      this.props.notificationCenter.onDaemonDidStart(() =>
+        this.updateBoards(this.state.query)
+      ),
+      this.props.notificationCenter.onDaemonDidStop(() =>
+        this.setState({ searchResults: [] })
+      ),
+      this.props.onFilteredTextDidChangeEvent((query) =>
+        this.setState({ query }, () => this.updateBoards(this.state.query))
+      ),
+    ]);
+  }
 
-        return <React.Fragment>
-            <div className='search'>
-                <input type='search' 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 }>
-                    key={`${board.name}-${board.packageName}`}
-                    item={board}
-                    label={board.name}
-                    details={board.details}
-                    selected={board.selected}
-                    onClick={this.selectBoard}
-                    missing={board.missing}
-                />)}
-            </div>
-        </React.Fragment>;
+  override componentWillUnmount(): void {
+    this.toDispose.dispose();
+  }
+
+  protected fireConfigChanged(): void {
+    const { selectedBoard, selectedPort } = this.state;
+    this.props.onConfigChange({ selectedBoard, selectedPort });
+  }
+
+  protected updateBoards = (
+    eventOrQuery: React.ChangeEvent<HTMLInputElement> | string = ''
+  ) => {
+    const query =
+      typeof eventOrQuery === 'string'
+        ? eventOrQuery
+        : eventOrQuery.target.value.toLowerCase();
+    this.setState({ query });
+    this.queryBoards({ query }).then((searchResults) =>
+      this.setState({ searchResults })
+    );
+  };
+
+  protected updatePorts = (ports: Port[] = [], removedPorts: Port[] = []) => {
+    this.queryPorts(Promise.resolve(ports)).then(({ knownPorts }) => {
+      let { selectedPort } = this.state;
+      // If the currently selected port is not available anymore, unset the selected port.
+      if (removedPorts.some((port) => Port.sameAs(port, selectedPort))) {
+        selectedPort = undefined;
+      }
+      this.setState({ knownPorts, selectedPort }, () =>
+        this.fireConfigChanged()
+      );
+    });
+  };
+
+  protected queryBoards = (
+    options: { query?: string } = {}
+  ): Promise<Array<BoardWithPackage>> => {
+    return this.props.boardsServiceProvider.searchBoards(options);
+  };
+
+  protected get availablePorts(): MaybePromise<Port[]> {
+    return this.props.boardsServiceProvider.availableBoards
+      .map(({ port }) => port)
+      .filter(notEmpty);
+  }
+
+  protected get availableBoards(): AvailableBoard[] {
+    return this.props.boardsServiceProvider.availableBoards;
+  }
+
+  protected queryPorts = async (
+    availablePorts: MaybePromise<Port[]> = this.availablePorts
+  ) => {
+    // Available ports must be sorted in this order:
+    // 1. Serial with recognized boards
+    // 2. Serial with guessed boards
+    // 3. Serial with incomplete boards
+    // 4. Network with recognized boards
+    // 5. Other protocols with recognized boards
+    const ports = (await availablePorts).sort((left: Port, right: Port) => {
+      if (left.protocol === 'serial' && right.protocol !== 'serial') {
+        return -1;
+      } else if (left.protocol !== 'serial' && right.protocol === 'serial') {
+        return 1;
+      } else if (left.protocol === 'network' && right.protocol !== 'network') {
+        return -1;
+      } else if (left.protocol !== 'network' && right.protocol === 'network') {
+        return 1;
+      } else if (left.protocol === right.protocol) {
+        // We show ports, including those that have guessed
+        // or unrecognized boards, so we must sort those too.
+        const leftBoard = this.availableBoards.find(
+          (board) => board.port === left
+        );
+        const rightBoard = this.availableBoards.find(
+          (board) => board.port === right
+        );
+        if (leftBoard && !rightBoard) {
+          return -1;
+        } else if (!leftBoard && rightBoard) {
+          return 1;
+        } else if (leftBoard?.state! < rightBoard?.state!) {
+          return -1;
+        } else if (leftBoard?.state! > rightBoard?.state!) {
+          return 1;
+        }
+      }
+      return naturalCompare(left.address, right.address);
+    });
+    return { knownPorts: ports };
+  };
+
+  protected toggleFilterPorts = () => {
+    this.setState({ showAllPorts: !this.state.showAllPorts });
+  };
+
+  protected selectPort = (selectedPort: Port | undefined) => {
+    this.setState({ selectedPort }, () => this.fireConfigChanged());
+  };
+
+  protected selectBoard = (selectedBoard: BoardWithPackage | undefined) => {
+    this.setState({ selectedBoard }, () => this.fireConfigChanged());
+  };
+
+  protected focusNodeSet = (element: HTMLElement | null) => {
+    this.props.onFocusNodeSet(element || undefined);
+  };
+
+  override render(): React.ReactNode {
+    return (
+      <>
+        {this.renderContainer(
+          nls.localize('arduino/board/boards', 'boards'),
+          this.renderBoards.bind(this)
+        )}
+        {this.renderContainer(
+          nls.localize('arduino/board/ports', 'ports'),
+          this.renderPorts.bind(this),
+          this.renderPortsFooter.bind(this)
+        )}
+      </>
+    );
+  }
+
+  protected renderContainer(
+    title: string,
+    contentRenderer: () => React.ReactNode,
+    footerRenderer?: () => React.ReactNode
+  ): React.ReactNode {
+    return (
+      <div className="container">
+        <div className="content">
+          <div className="title">{title}</div>
+          {contentRenderer()}
+          <div className="footer">{footerRenderer ? footerRenderer() : ''}</div>
+        </div>
+      </div>
+    );
+  }
+
+  protected renderBoards(): React.ReactNode {
+    const { selectedBoard, searchResults, query } = this.state;
+    // Board names are not unique per core https://github.com/arduino/arduino-pro-ide/issues/262#issuecomment-661019560
+    // It is tricky when the core is not yet installed, no FQBNs are available.
+    const distinctBoards = new Map<string, Board.Detailed>();
+    const toKey = ({ name, packageName, fqbn }: Board.Detailed) =>
+      !!fqbn ? `${name}-${packageName}-${fqbn}` : `${name}-${packageName}`;
+    for (const board of Board.decorateBoards(selectedBoard, searchResults)) {
+      const key = toKey(board);
+      if (!distinctBoards.has(key)) {
+        distinctBoards.set(key, board);
+      }
     }
 
-    protected renderPorts(): React.ReactNode {
-        const filter = this.state.showAllPorts ? () => true : Port.isBoardPort;
-        const ports = this.state.knownPorts.filter(filter);
-        return !ports.length ?
-            (
-                <div className='loading noselect'>
-                    No ports discovered
-                </div>
-            ) :
-            (
-                <div className='ports list'>
-                    {ports.map(port => <Item<Port>
-                        key={Port.toString(port)}
-                        item={port}
-                        label={Port.toString(port)}
-                        selected={Port.equals(this.state.selectedPort, port)}
-                        onClick={this.selectPort}
-                    />)}
-                </div>
-            );
-    }
+    const boardsList = Array.from(distinctBoards.values()).map((board) => (
+      <Item<BoardWithPackage>
+        key={toKey(board)}
+        item={board}
+        label={board.name}
+        details={board.details}
+        selected={board.selected}
+        onClick={this.selectBoard}
+        missing={board.missing}
+      />
+    ));
 
-    protected renderPortsFooter(): React.ReactNode {
-        return <div className='noselect'>
-            <label
-                title='Shows all available ports when enabled'>
-                <input
-                    type='checkbox'
-                    defaultChecked={this.state.showAllPorts}
-                    onChange={this.toggleFilterPorts}
-                />
-                <span>Show all ports</span>
-            </label>
-        </div>;
-    }
+    return (
+      <React.Fragment>
+        <div className="search">
+          <input
+            type="search"
+            value={query}
+            className="theia-input"
+            placeholder={nls.localize(
+              'arduino/board/searchBoard',
+              'Search board'
+            )}
+            onChange={this.updateBoards}
+            ref={this.focusNodeSet}
+          />
+          <i className="fa fa-search"></i>
+        </div>
+        {boardsList.length > 0 ? (
+          <div className="boards list">{boardsList}</div>
+        ) : (
+          <div className="no-result">
+            {nls.localize(
+              'arduino/board/noBoardsFound',
+              'No boards found for "{0}"',
+              query
+            )}
+          </div>
+        )}
+      </React.Fragment>
+    );
+  }
 
+  protected renderPorts(): React.ReactNode {
+    let ports = [] as Port[];
+    if (this.state.showAllPorts) {
+      ports = this.state.knownPorts;
+    } else {
+      ports = this.state.knownPorts.filter(
+        Port.visiblePorts(this.availableBoards)
+      );
+    }
+    return !ports.length ? (
+      <div className="no-result">
+        {nls.localize('arduino/board/noPortsDiscovered', 'No ports discovered')}
+      </div>
+    ) : (
+      <div className="ports list">
+        {ports.map((port) => (
+          <Item<Port>
+            key={`${Port.keyOf(port)}`}
+            item={port}
+            label={Port.toString(port)}
+            selected={Port.sameAs(this.state.selectedPort, port)}
+            onClick={this.selectPort}
+          />
+        ))}
+      </div>
+    );
+  }
+
+  protected renderPortsFooter(): React.ReactNode {
+    return (
+      <div className="noselect">
+        <label
+          title={nls.localize(
+            'arduino/board/showAllAvailablePorts',
+            'Shows all available ports when enabled'
+          )}
+        >
+          <input
+            type="checkbox"
+            defaultChecked={this.state.showAllPorts}
+            onChange={this.toggleFilterPorts}
+          />
+          <span>
+            {nls.localize('arduino/board/showAllPorts', 'Show all ports')}
+          </span>
+        </label>
+      </div>
+    );
+  }
 }
 
 export namespace BoardsConfig {
-
-    export namespace Config {
-
-        export function sameAs(config: Config, other: Config | Board): boolean {
-            const { selectedBoard, selectedPort } = config;
-            if (Board.is(other)) {
-                return !!selectedBoard
-                    && Board.equals(other, selectedBoard)
-                    && Port.sameAs(selectedPort, other.port);
-            }
-            return sameAs(config, other);
-        }
-
-        export function equals(left: Config, right: Config): boolean {
-            return left.selectedBoard === right.selectedBoard
-                && left.selectedPort === right.selectedPort;
-        }
-
-        export function toString(config: Config, options: { default: string } = { default: '' }): string {
-            const { selectedBoard, selectedPort: port } = config;
-            if (!selectedBoard) {
-                return options.default;
-            }
-            const { name } = selectedBoard;
-            return `${name}${port ? ' at ' + Port.toString(port) : ''}`;
-        }
-
+  export namespace Config {
+    export function sameAs(config: Config, other: Config | Board): boolean {
+      const { selectedBoard, selectedPort } = config;
+      if (Board.is(other)) {
+        return (
+          !!selectedBoard &&
+          Board.equals(other, selectedBoard) &&
+          Port.sameAs(selectedPort, other.port)
+        );
+      }
+      return sameAs(config, other);
     }
 
+    export function equals(left: Config, right: Config): boolean {
+      return (
+        left.selectedBoard === right.selectedBoard &&
+        left.selectedPort === right.selectedPort
+      );
+    }
+
+    export function toString(
+      config: Config,
+      options: { default: string } = { default: '' }
+    ): string {
+      const { selectedBoard, selectedPort: port } = config;
+      if (!selectedBoard) {
+        return options.default;
+      }
+      const { name } = selectedBoard;
+      return `${name}${port ? ` at ${port.address}` : ''}`;
+    }
+  }
 }

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

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

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

@@ -1,200 +1,219 @@
-import { injectable, inject, named } from 'inversify';
+import { injectable, inject, named } from '@theia/core/shared/inversify';
 import { ILogger } from '@theia/core/lib/common/logger';
 import { deepClone } from '@theia/core/lib/common/objects';
-import { MaybePromise } from '@theia/core/lib/common/types';
 import { Event, Emitter } from '@theia/core/lib/common/event';
-import { FrontendApplicationContribution, LocalStorageService } from '@theia/core/lib/browser';
+import {
+  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 {
+  BoardsService,
+  ConfigOption,
+  BoardDetails,
+  Programmer,
+} from '../../common/protocol';
+import { NotificationCenter } from '../notification-center';
 
 @injectable()
 export class BoardsDataStore implements FrontendApplicationContribution {
+  @inject(ILogger)
+  @named('store')
+  protected readonly logger: ILogger;
 
-    @inject(ILogger)
-    @named('store')
-    protected readonly logger: ILogger;
+  @inject(BoardsService)
+  protected readonly boardsService: BoardsService;
 
-    @inject(BoardsService)
-    protected readonly boardsService: BoardsService;
+  @inject(NotificationCenter)
+  protected readonly notificationCenter: NotificationCenter;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+  @inject(LocalStorageService)
+  protected readonly storageService: LocalStorageService;
 
-    @inject(LocalStorageService)
-    protected readonly storageService: LocalStorageService;
+  protected readonly onChangedEmitter = new Emitter<void>();
 
-    protected readonly onChangedEmitter = new Emitter<void>();
-
-    onStart(): void {
-        this.boardsServiceClient.onBoardsPackageInstalled(async ({ item }) => {
-            const { installedVersion: version } = item;
-            if (!version) {
-                return;
+  onStart(): void {
+    this.notificationCenter.onPlatformDidInstall(async ({ item }) => {
+      let shouldFireChanged = false;
+      for (const fqbn of item.boards
+        .map(({ fqbn }) => fqbn)
+        .filter(notEmpty)
+        .filter((fqbn) => !!fqbn)) {
+        const key = this.getStorageKey(fqbn);
+        let data = await this.storageService.getData<
+          ConfigOption[] | undefined
+        >(key);
+        if (!data || !data.length) {
+          const details = await this.getBoardDetailsSafe(fqbn);
+          if (details) {
+            data = details.configOptions;
+            if (data.length) {
+              await this.storageService.setData(key, data);
+              shouldFireChanged = true;
             }
-            let shouldFireChanged = false;
-            for (const fqbn of item.boards.map(({ fqbn }) => fqbn).filter(notEmpty).filter(fqbn => !!fqbn)) {
-                const key = this.getStorageKey(fqbn, version);
-                let data = await this.storageService.getData<ConfigOption[] | undefined>(key);
-                if (!data || !data.length) {
-                    const details = await this.getBoardDetailsSafe(fqbn);
-                    if (details) {
-                        data = details.configOptions;
-                        if (data.length) {
-                            await this.storageService.setData(key, data);
-                            shouldFireChanged = true;
-                        }
-                    }
-                }
-            }
-            if (shouldFireChanged) {
-                this.fireChanged();
-            }
-        });
-    }
-
-    get onChanged(): Event<void> {
-        return this.onChangedEmitter.event;
-    }
-
-    async appendConfigToFqbn(
-        fqbn: string,
-        boardsPackageVersion: MaybePromise<Installable.Version | undefined> = this.getBoardsPackageVersion(fqbn)): Promise<string> {
-
-        const { configOptions } = await this.getData(fqbn, boardsPackageVersion);
-        return ConfigOption.decorate(fqbn, configOptions);
-    }
-
-    async getData(
-        fqbn: string,
-        boardsPackageVersion: MaybePromise<Installable.Version | undefined> = this.getBoardsPackageVersion(fqbn)): Promise<BoardsDataStore.Data> {
-
-        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;
-            }
-        }
-
-        const boardDetails = await this.getBoardDetailsSafe(fqbn);
-        if (!boardDetails) {
-            return BoardsDataStore.Data.EMPTY;
-        }
-
-        data = { configOptions: boardDetails.configOptions, programmers: boardDetails.programmers };
-        await this.storageService.setData(key, data);
-        return data;
-    }
-
-    async selectProgrammer(
-        { fqbn, selectedProgrammer }: { fqbn: string, selectedProgrammer: Programmer },
-        boardsPackageVersion: MaybePromise<Installable.Version | undefined> = this.getBoardsPackageVersion(fqbn)): Promise<boolean> {
-
-        const data = deepClone(await this.getData(fqbn, boardsPackageVersion));
-        const { programmers } = data;
-        if (!programmers.find(p => Programmer.equals(selectedProgrammer, p))) {
-            return false;
-        }
-
-        const version = await boardsPackageVersion;
-        if (!version) {
-            return false;
-        }
-
-        await this.setData({ fqbn, data: { ...data, selectedProgrammer }, version });
+      }
+      if (shouldFireChanged) {
         this.fireChanged();
-        return true;
+      }
+    });
+  }
+
+  get onChanged(): Event<void> {
+    return this.onChangedEmitter.event;
+  }
+
+  async appendConfigToFqbn(
+    fqbn: string | undefined,
+  ): Promise<string | undefined> {
+    if (!fqbn) {
+      return undefined;
+    }
+    const { configOptions } = await this.getData(fqbn);
+    return ConfigOption.decorate(fqbn, configOptions);
+  }
+
+  async getData(fqbn: string | undefined): Promise<BoardsDataStore.Data> {
+    if (!fqbn) {
+      return BoardsDataStore.Data.EMPTY;
     }
 
-    async selectConfigOption(
-        { fqbn, option, selectedValue }: { fqbn: string, option: string, selectedValue: string },
-        boardsPackageVersion: MaybePromise<Installable.Version | undefined> = this.getBoardsPackageVersion(fqbn)): Promise<boolean> {
-
-        const data = deepClone(await this.getData(fqbn, boardsPackageVersion));
-        const { configOptions } = data;
-        const configOption = configOptions.find(c => c.option === option);
-        if (!configOption) {
-            return false;
-        }
-        let updated = false;
-        for (const value of configOption.values) {
-            if (value.value === selectedValue) {
-                (value as any).selected = true;
-                updated = true;
-            } else {
-                (value as any).selected = false;
-            }
-        }
-        if (!updated) {
-            return false;
-        }
-        const version = await boardsPackageVersion;
-        if (!version) {
-            return false;
-        }
-
-        await this.setData({ fqbn, data, version });
-        this.fireChanged();
-        return true;
+    const key = this.getStorageKey(fqbn);
+    let data = await this.storageService.getData<
+      BoardsDataStore.Data | undefined
+    >(key, undefined);
+    if (BoardsDataStore.Data.is(data)) {
+      return data;
     }
 
-    protected async setData(
-        { fqbn, data, version }: { fqbn: string, data: BoardsDataStore.Data, version: Installable.Version }): Promise<void> {
-
-        const key = this.getStorageKey(fqbn, version);
-        return this.storageService.setData(key, data);
+    const boardDetails = await this.getBoardDetailsSafe(fqbn);
+    if (!boardDetails) {
+      return BoardsDataStore.Data.EMPTY;
     }
 
-    protected getStorageKey(fqbn: string, version: Installable.Version): string {
-        return `.arduinoProIDE-configOptions-${version}-${fqbn}`;
+    data = {
+      configOptions: boardDetails.configOptions,
+      programmers: boardDetails.programmers,
+    };
+    await this.storageService.setData(key, data);
+    return data;
+  }
+
+  async selectProgrammer(
+    {
+      fqbn,
+      selectedProgrammer,
+    }: { fqbn: string; selectedProgrammer: Programmer },
+  ): Promise<boolean> {
+    const data = deepClone(await this.getData(fqbn));
+    const { programmers } = data;
+    if (!programmers.find((p) => Programmer.equals(selectedProgrammer, p))) {
+      return false;
     }
 
-    protected async getBoardDetailsSafe(fqbn: string): Promise<BoardDetails | undefined> {
-        try {
-            const details = this.boardsService.getBoardDetails({ fqbn });
-            return details;
-        } catch (err) {
-            if (err instanceof Error && err.message.includes('loading board data') && err.message.includes('is not installed')) {
-                this.logger.warn(`The boards package is not installed for board with FQBN: ${fqbn}`);
-            } else {
-                this.logger.error(`An unexpected error occurred while retrieving the board details for ${fqbn}.`, err);
-            }
-            return undefined;
-        }
-    }
+    await this.setData({
+      fqbn,
+      data: { ...data, selectedProgrammer },
+    });
+    this.fireChanged();
+    return true;
+  }
 
-    protected fireChanged(): void {
-        this.onChangedEmitter.fire();
+  async selectConfigOption(
+    {
+      fqbn,
+      option,
+      selectedValue,
+    }: { fqbn: string; option: string; selectedValue: string }
+  ): Promise<boolean> {
+    const data = deepClone(await this.getData(fqbn));
+    const { configOptions } = data;
+    const configOption = configOptions.find((c) => c.option === option);
+    if (!configOption) {
+      return false;
     }
-
-    protected async getBoardsPackageVersion(fqbn: string): Promise<Installable.Version | undefined> {
-        if (!fqbn) {
-            return undefined;
-        }
-        const boardsPackage = await this.boardsService.getContainerBoardPackage({ fqbn });
-        if (!boardsPackage) {
-            return undefined;
-        }
-        return boardsPackage.installedVersion;
+    let updated = false;
+    for (const value of configOption.values) {
+      if (value.value === selectedValue) {
+        (value as any).selected = true;
+        updated = true;
+      } else {
+        (value as any).selected = false;
+      }
     }
+    if (!updated) {
+      return false;
+    }
+    await this.setData({ fqbn, data });
+    this.fireChanged();
+    return true;
+  }
 
+  protected async setData({
+    fqbn,
+    data,
+  }: {
+    fqbn: string;
+    data: BoardsDataStore.Data;
+  }): Promise<void> {
+    const key = this.getStorageKey(fqbn);
+    return this.storageService.setData(key, data);
+  }
+
+  protected getStorageKey(fqbn: string): string {
+    return `.arduinoIDE-configOptions-${fqbn}`;
+  }
+
+  protected async getBoardDetailsSafe(
+    fqbn: string
+  ): Promise<BoardDetails | undefined> {
+    try {
+      const details = this.boardsService.getBoardDetails({ fqbn });
+      return details;
+    } catch (err) {
+      if (
+        err instanceof Error &&
+        err.message.includes('loading board data') &&
+        err.message.includes('is not installed')
+      ) {
+        this.logger.warn(
+          `The boards package is not installed for board with FQBN: ${fqbn}`
+        );
+      } else {
+        this.logger.error(
+          `An unexpected error occurred while retrieving the board details for ${fqbn}.`,
+          err
+        );
+      }
+      return undefined;
+    }
+  }
+
+  protected fireChanged(): void {
+    this.onChangedEmitter.fire();
+  }
 }
 
 export namespace BoardsDataStore {
-    export interface Data {
-        readonly configOptions: ConfigOption[];
-        readonly programmers: Programmer[];
-        readonly selectedProgrammer?: Programmer;
-    }
-    export namespace Data {
-        export const EMPTY: Data = {
-            configOptions: [],
-            programmers: []
-        };
+  export interface Data {
+    readonly configOptions: ConfigOption[];
+    readonly programmers: Programmer[];
+    readonly selectedProgrammer?: Programmer;
+  }
+  export namespace Data {
+    export const EMPTY: Data = {
+      configOptions: [],
+      programmers: [],
+    };
+    export function is(arg: any): arg is Data {
+      return (
+        !!arg &&
+        'configOptions' in arg &&
+        Array.isArray(arg['configOptions']) &&
+        'programmers' in arg &&
+        Array.isArray(arg['programmers'])
+      );
     }
+  }
 }

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

@@ -1,27 +1,92 @@
-import { inject, injectable } from 'inversify';
-import { BoardsPackage, BoardsService } from '../../common/protocol/boards-service';
+import {
+  inject,
+  injectable,
+  postConstruct,
+} from '@theia/core/shared/inversify';
+import {
+  BoardSearch,
+  BoardsPackage,
+  BoardsService,
+} from '../../common/protocol/boards-service';
 import { ListWidget } from '../widgets/component-list/list-widget';
 import { ListItemRenderer } from '../widgets/component-list/list-item-renderer';
+import { nls } from '@theia/core/lib/common';
+import { BoardsFilterRenderer } from '../widgets/component-list/filter-renderer';
 
 @injectable()
-export class BoardsListWidget extends ListWidget<BoardsPackage> {
+export class BoardsListWidget extends ListWidget<BoardsPackage, BoardSearch> {
+  static WIDGET_ID = 'boards-list-widget';
+  static WIDGET_LABEL = nls.localize('arduino/boardsManager', 'Boards Manager');
 
-    static WIDGET_ID = 'boards-list-widget';
-    static WIDGET_LABEL = 'Boards Manager';
+  constructor(
+    @inject(BoardsService) service: BoardsService,
+    @inject(ListItemRenderer) itemRenderer: ListItemRenderer<BoardsPackage>,
+    @inject(BoardsFilterRenderer) filterRenderer: BoardsFilterRenderer
+  ) {
+    super({
+      id: BoardsListWidget.WIDGET_ID,
+      label: BoardsListWidget.WIDGET_LABEL,
+      iconClass: 'fa fa-arduino-boards',
+      searchable: service,
+      installable: service,
+      itemLabel: (item: BoardsPackage) => item.name,
+      itemDeprecated: (item: BoardsPackage) => item.deprecated,
+      itemRenderer,
+      filterRenderer,
+      defaultSearchOptions: { query: '', type: 'All' },
+    });
+  }
 
-    constructor(
-        @inject(BoardsService) protected service: BoardsService,
-        @inject(ListItemRenderer) protected itemRenderer: ListItemRenderer<BoardsPackage>) {
+  @postConstruct()
+  protected override init(): void {
+    super.init();
+    this.toDispose.pushAll([
+      this.notificationCenter.onPlatformDidInstall(() =>
+        this.refresh(undefined)
+      ),
+      this.notificationCenter.onPlatformDidUninstall(() =>
+        this.refresh(undefined)
+      ),
+    ]);
+  }
 
-        super({
-            id: BoardsListWidget.WIDGET_ID,
-            label: BoardsListWidget.WIDGET_LABEL,
-            iconClass: 'fa fa-microchip',
-            searchable: service,
-            installable: service,
-            itemLabel: (item: BoardsPackage) => item.name,
-            itemRenderer
-        });
-    }
+  protected override async install({
+    item,
+    progressId,
+    version,
+  }: {
+    item: BoardsPackage;
+    progressId: string;
+    version: string;
+  }): Promise<void> {
+    await super.install({ item, progressId, version });
+    this.messageService.info(
+      nls.localize(
+        'arduino/board/succesfullyInstalledPlatform',
+        'Successfully installed platform {0}:{1}',
+        item.name,
+        version
+      ),
+      { timeout: 3000 }
+    );
+  }
 
+  protected override async uninstall({
+    item,
+    progressId,
+  }: {
+    item: BoardsPackage;
+    progressId: string;
+  }): Promise<void> {
+    await super.uninstall({ item, progressId });
+    this.messageService.info(
+      nls.localize(
+        'arduino/board/succesfullyUninstalledPlatform',
+        'Successfully uninstalled platform {0}:{1}',
+        item.name,
+        item.installedVersion!
+      ),
+      { timeout: 3000 }
+    );
+  }
 }

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

@@ -1,438 +0,0 @@
-import { injectable, inject } from 'inversify';
-import { Emitter } from '@theia/core/lib/common/event';
-import { ILogger } from '@theia/core/lib/common/logger';
-import { MessageService } from '@theia/core/lib/common/message-service';
-import { StorageService } from '@theia/core/lib/browser/storage-service';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
-import { RecursiveRequired } from '../../common/types';
-import {
-    Port,
-    Board,
-    BoardsService,
-    BoardsPackage,
-    InstalledEvent,
-    UninstalledEvent,
-    BoardsServiceClient,
-    AttachedBoardsChangeEvent
-} from '../../common/protocol';
-import { BoardsConfig } from './boards-config';
-import { naturalCompare } from '../../common/utils';
-import { compareAnything } from '../theia/monaco/comparers';
-
-interface BoardMatch {
-    readonly board: Board & Readonly<{ packageName: string }>;
-    readonly matches: monaco.filters.IMatch[] | undefined;
-}
-
-@injectable()
-export class BoardsServiceClientImpl implements BoardsServiceClient, FrontendApplicationContribution {
-
-    @inject(ILogger)
-    protected logger: ILogger;
-
-    @inject(MessageService)
-    protected messageService: MessageService;
-
-    @inject(StorageService)
-    protected storageService: StorageService;
-
-    protected readonly onBoardsPackageInstalledEmitter = new Emitter<InstalledEvent<BoardsPackage>>();
-    protected readonly onBoardsPackageUninstalledEmitter = new Emitter<UninstalledEvent<BoardsPackage>>();
-    protected readonly onAttachedBoardsChangedEmitter = new Emitter<AttachedBoardsChangeEvent>();
-    protected readonly onBoardsConfigChangedEmitter = new Emitter<BoardsConfig.Config>();
-    protected readonly onAvailableBoardsChangedEmitter = new Emitter<AvailableBoard[]>();
-
-    /**
-     * Used for the auto-reconnecting. Sometimes, the attached board gets disconnected after uploading something to it.
-     * It happens with certain boards on Windows. For example, the `MKR1000` boards is selected on post `COM5` on Windows,
-     * perform an upload, the board automatically disconnects and reconnects, but on another port, `COM10`.
-     * We have to listen on such changes and auto-reconnect the same board on another port.
-     * See: https://arduino.slack.com/archives/CJJHJCJSJ/p1568645417013000?thread_ts=1568640504.009400&cid=CJJHJCJSJ
-     */
-    protected latestValidBoardsConfig: RecursiveRequired<BoardsConfig.Config> | undefined = undefined;
-    protected _boardsConfig: BoardsConfig.Config = {};
-    protected _attachedBoards: Board[] = []; // This does not contain the `Unknown` boards. They're visible from the available ports only.
-    protected _availablePorts: Port[] = [];
-    protected _availableBoards: AvailableBoard[] = [];
-    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,
-     * and the user installs the board package. Note: installing a board package will set the `fqbn` of the
-     * currently selected board.\
-     * This even also emitted when the board package for the currently selected board was uninstalled.
-     */
-    readonly onBoardsConfigChanged = this.onBoardsConfigChangedEmitter.event;
-    readonly onAvailableBoardsChanged = this.onAvailableBoardsChangedEmitter.event;
-
-    async onStart(): Promise<void> {
-        return this.loadState();
-    }
-
-    /**
-     * 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([
-            this.boardsService.getAttachedBoards(),
-            this.boardsService.getAvailablePorts()
-        ]);
-        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));
-        this._attachedBoards = event.newState.boards;
-        this.onAttachedBoardsChangedEmitter.fire(event);
-        this._availablePorts = event.newState.ports;
-        this.reconcileAvailableBoards().then(() => this.tryReconnect());
-    }
-
-    protected async tryReconnect(): Promise<boolean> {
-        if (this.latestValidBoardsConfig && !this.canUploadTo(this.boardsConfig)) {
-            for (const board of this.availableBoards.filter(({ state }) => state !== AvailableBoard.State.incomplete)) {
-                if (this.latestValidBoardsConfig.selectedBoard.fqbn === board.fqbn
-                    && this.latestValidBoardsConfig.selectedBoard.name === board.name
-                    && Port.sameAs(this.latestValidBoardsConfig.selectedPort, board.port)) {
-
-                    this.boardsConfig = this.latestValidBoardsConfig;
-                    return true;
-                }
-            }
-            // If we could not find an exact match, we compare the board FQBN-name pairs and ignore the port, as it might have changed.
-            // See documentation on `latestValidBoardsConfig`.
-            for (const board of this.availableBoards.filter(({ state }) => state !== AvailableBoard.State.incomplete)) {
-                if (this.latestValidBoardsConfig.selectedBoard.fqbn === board.fqbn
-                    && this.latestValidBoardsConfig.selectedBoard.name === board.name) {
-
-                    this.boardsConfig = {
-                        ...this.latestValidBoardsConfig,
-                        selectedPort: board.port
-                    };
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    notifyInstalled(event: InstalledEvent<BoardsPackage>): void {
-        this.logger.info('Boards package installed: ', JSON.stringify(event));
-        this.onBoardsPackageInstalledEmitter.fire(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
-                };
-            }
-        }
-    }
-
-    notifyUninstalled(event: UninstalledEvent<BoardsPackage>): void {
-        this.logger.info('Boards package uninstalled: ', JSON.stringify(event));
-        this.onBoardsPackageUninstalledEmitter.fire(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
-                };
-            }
-        }
-    }
-
-    set boardsConfig(config: BoardsConfig.Config) {
-        this.doSetBoardsConfig(config);
-        this.saveState().finally(() => this.reconcileAvailableBoards().finally(() => this.onBoardsConfigChangedEmitter.fire(this._boardsConfig)));
-    }
-
-    protected doSetBoardsConfig(config: BoardsConfig.Config): void {
-        this.logger.info('Board config changed: ', JSON.stringify(config));
-        this._boardsConfig = config;
-        if (this.canUploadTo(this._boardsConfig)) {
-            this.latestValidBoardsConfig = this._boardsConfig;
-        }
-    }
-
-    async searchBoards({ query, cores }: { query?: string, cores?: string[] }): Promise<Array<Board & { packageName: string }>> {
-        const boards = await this.boardsService.allBoards({});
-        const coresFilter = !!cores && cores.length
-            ? ((toFilter: { packageName: string }) => cores.some(core => core === toFilter.packageName))
-            : () => 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 compareEntries = (left: BoardMatch, right: BoardMatch, lookFor: string) => {
-            const leftMatches = left.matches || [];
-            const rightMatches = right.matches || [];
-            if (leftMatches.length && !rightMatches.length) {
-                return -1;
-            }
-            if (!leftMatches.length && rightMatches.length) {
-                return 1;
-            }
-            if (leftMatches.length === 0 && rightMatches.length === 0) {
-                return 0;
-            }
-            const leftLabel = left.board.name.replace(/\r?\n/g, ' ');
-            const rightLabel = right.board.name.replace(/\r?\n/g, ' ');
-            return compareAnything(leftLabel, rightLabel, lookFor);
-        }
-        const normalizedQuery = query.toLowerCase();
-        return boards
-            .filter(coresFilter)
-            .map(toMatch)
-            .filter(({ matches }) => !!matches)
-            .sort((left, right) => compareEntries(left, right, normalizedQuery))
-            .map(({ board }) => board);
-    }
-
-    get boardsConfig(): BoardsConfig.Config {
-        return this._boardsConfig;
-    }
-
-    /**
-     * `true` if the `config.selectedBoard` is defined; hence can compile against the board. Otherwise, `false`.
-     */
-    canVerify(
-        config: BoardsConfig.Config | undefined = this.boardsConfig,
-        options: { silent: boolean } = { silent: true }): config is BoardsConfig.Config & { selectedBoard: Board } {
-
-        if (!config) {
-            return false;
-        }
-
-        if (!config.selectedBoard) {
-            if (!options.silent) {
-                this.messageService.warn('No boards selected.', { timeout: 3000 });
-            }
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * `true` if `canVerify`, the board has an FQBN and the `config.selectedPort` is also set, hence can upload to board. Otherwise, `false`.
-     */
-    canUploadTo(
-        config: BoardsConfig.Config | undefined = this.boardsConfig,
-        options: { silent: boolean } = { silent: true }): config is RecursiveRequired<BoardsConfig.Config> {
-
-        if (!this.canVerify(config, options)) {
-            return false;
-        }
-
-        const { name } = config.selectedBoard;
-        if (!config.selectedPort) {
-            if (!options.silent) {
-                this.messageService.warn(`No ports selected for board: '${name}'.`, { timeout: 3000 });
-            }
-            return false;
-        }
-
-        if (!config.selectedBoard.fqbn) {
-            if (!options.silent) {
-                this.messageService.warn(`The FQBN is not available for the selected board ${name}. Do you have the corresponding core installed?`, { timeout: 3000 });
-            }
-            return false;
-        }
-
-        return true;
-    }
-
-    get availableBoards(): AvailableBoard[] {
-        return this._availableBoards;
-    }
-
-    protected async reconcileAvailableBoards(): Promise<void> {
-        const attachedBoards = this._attachedBoards;
-        const availablePorts = this._availablePorts;
-        // Unset the port on the user's config, if it is not available anymore.
-        if (this.boardsConfig.selectedPort && !availablePorts.some(port => Port.sameAs(port, this.boardsConfig.selectedPort))) {
-            this.doSetBoardsConfig({ selectedBoard: this.boardsConfig.selectedBoard, selectedPort: undefined });
-            this.onBoardsConfigChangedEmitter.fire(this._boardsConfig);
-        }
-        const boardsConfig = this.boardsConfig;
-        const currentAvailableBoards = this._availableBoards;
-        const availableBoards: AvailableBoard[] = [];
-        const availableBoardPorts = availablePorts.filter(Port.isBoardPort);
-        const attachedSerialBoards = attachedBoards.filter(({ port }) => !!port);
-
-        for (const boardPort of availableBoardPorts) {
-            let state = AvailableBoard.State.incomplete; // Initial pessimism.
-            let board = attachedSerialBoards.find(({ port }) => Port.sameAs(boardPort, port));
-            if (board) {
-                state = AvailableBoard.State.recognized;
-            } else {
-                // If the selected board is not recognized because it is a 3rd party board: https://github.com/arduino/arduino-cli/issues/623
-                // We still want to show it without the red X in the boards toolbar: https://github.com/arduino/arduino-pro-ide/issues/198#issuecomment-599355836
-                const lastSelectedBoard = await this.getLastSelectedBoardOnPort(boardPort);
-                if (lastSelectedBoard) {
-                    board = {
-                        ...lastSelectedBoard,
-                        port: boardPort
-                    };
-                    state = AvailableBoard.State.guessed;
-                }
-            }
-            if (!board) {
-                availableBoards.push({ name: 'Unknown', port: boardPort, state });
-            } else {
-                const selected = BoardsConfig.Config.sameAs(boardsConfig, board);
-                availableBoards.push({ ...board, state, selected, port: boardPort });
-            }
-        }
-
-        if (boardsConfig.selectedBoard && !availableBoards.some(({ selected }) => selected)) {
-            availableBoards.push({
-                ...boardsConfig.selectedBoard,
-                port: boardsConfig.selectedPort,
-                selected: true,
-                state: AvailableBoard.State.incomplete
-            });
-        }
-
-        const sortedAvailableBoards = availableBoards.sort(AvailableBoard.compare);
-        let hasChanged = sortedAvailableBoards.length !== currentAvailableBoards.length;
-        for (let i = 0; !hasChanged && i < sortedAvailableBoards.length; i++) {
-            hasChanged = AvailableBoard.compare(sortedAvailableBoards[i], currentAvailableBoards[i]) !== 0;
-        }
-        if (hasChanged) {
-            this._availableBoards = sortedAvailableBoards;
-            this.onAvailableBoardsChangedEmitter.fire(this._availableBoards);
-        }
-    }
-
-    protected async getLastSelectedBoardOnPort(port: Port | string | undefined): Promise<Board | undefined> {
-        if (!port) {
-            return undefined;
-        }
-        const key = this.getLastSelectedBoardOnPortKey(port);
-        return this.storageService.getData<Board>(key);
-    }
-
-    protected async saveState(): Promise<void> {
-        // We save the port with the selected board name/FQBN, to be able to guess a better board name.
-        // Required when the attached board belongs to a 3rd party boards package, and neither the name, nor
-        // the FQBN can be retrieved with a `board list` command.
-        // https://github.com/arduino/arduino-cli/issues/623
-        const { selectedBoard, selectedPort } = this.boardsConfig;
-        if (selectedBoard && selectedPort) {
-            const key = this.getLastSelectedBoardOnPortKey(selectedPort);
-            await this.storageService.setData(key, selectedBoard);
-        }
-        await this.storageService.setData('latest-valid-boards-config', this.latestValidBoardsConfig);
-    }
-
-    protected getLastSelectedBoardOnPortKey(port: Port | string): string {
-        // TODO: we lose the port's `protocol` info (`serial`, `network`, etc.) here if the `port` is a `string`.
-        return `last-selected-board-on-port:${typeof port === 'string' ? port : Port.toString(port)}`;
-    }
-
-    protected async loadState(): Promise<void> {
-        const storedValidBoardsConfig = await this.storageService.getData<RecursiveRequired<BoardsConfig.Config>>('latest-valid-boards-config');
-        if (storedValidBoardsConfig) {
-            this.latestValidBoardsConfig = storedValidBoardsConfig;
-            if (this.canUploadTo(this.latestValidBoardsConfig)) {
-                this.boardsConfig = this.latestValidBoardsConfig;
-            }
-        }
-    }
-
-}
-
-/**
- * Representation of a ready-to-use board, either the user has configured it or was automatically recognized by the CLI.
- * An available board was not necessarily recognized by the CLI (e.g.: it is a 3rd party board) or correctly configured but ready for `verify`.
- * If it has the selected board and a associated port, it can be used for `upload`. We render an available board for the user
- * when it has the `port` set.
- */
-export interface AvailableBoard extends Board {
-    readonly state: AvailableBoard.State;
-    readonly selected?: boolean;
-    readonly port?: Port;
-}
-
-export namespace AvailableBoard {
-
-    export enum State {
-        /**
-         * Retrieved from the CLI via the `board list` command.
-         */
-        'recognized',
-        /**
-         * Guessed the name/FQBN of the board from the available board ports (3rd party).
-         */
-        'guessed',
-        /**
-         * We do not know anything about this board, probably a 3rd party. The user has not selected a board for this port yet.
-         */
-        'incomplete'
-    }
-
-    export function is(board: any): board is AvailableBoard {
-        return Board.is(board) && 'state' in board;
-    }
-
-    export function hasPort(board: AvailableBoard): board is AvailableBoard & { port: Port } {
-        return !!board.port;
-    }
-
-    export const compare = (left: AvailableBoard, right: AvailableBoard) => {
-        if (left.selected && !right.selected) {
-            return -1;
-        }
-        if (right.selected && !left.selected) {
-            return 1;
-        }
-        let result = naturalCompare(left.name, right.name);
-        if (result !== 0) {
-            return result;
-        }
-        if (left.fqbn && right.fqbn) {
-            result = naturalCompare(left.fqbn, right.fqbn);
-            if (result !== 0) {
-                return result;
-            }
-        }
-        if (left.port && right.port) {
-            result = Port.compare(left.port, right.port);
-            if (result !== 0) {
-                return result;
-            }
-        }
-        if (!!left.selected && !right.selected) {
-            return -1;
-        }
-        if (!!right.selected && !left.selected) {
-            return 1;
-        }
-        return left.state - right.state;
-    }
-
-}

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

@@ -0,0 +1,826 @@
+import { injectable, inject } from '@theia/core/shared/inversify';
+import { Emitter } from '@theia/core/lib/common/event';
+import { ILogger } from '@theia/core/lib/common/logger';
+import {
+  Command,
+  CommandContribution,
+  CommandRegistry,
+  CommandService,
+} from '@theia/core/lib/common/command';
+import { MessageService } from '@theia/core/lib/common/message-service';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { RecursiveRequired } from '../../common/types';
+import {
+  Port,
+  Board,
+  BoardsService,
+  BoardsPackage,
+  AttachedBoardsChangeEvent,
+  BoardWithPackage,
+  BoardUserField,
+  AvailablePorts,
+} from '../../common/protocol';
+import { BoardsConfig } from './boards-config';
+import { naturalCompare } from '../../common/utils';
+import { NotificationCenter } from '../notification-center';
+import { StorageWrapper } from '../storage-wrapper';
+import { nls } from '@theia/core/lib/common';
+import { Deferred } from '@theia/core/lib/common/promise-util';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import { Unknown } from '../../common/nls';
+import {
+  StartupTask,
+  StartupTaskProvider,
+} from '../../electron-common/startup-task';
+
+@injectable()
+export class BoardsServiceProvider
+  implements
+    FrontendApplicationContribution,
+    StartupTaskProvider,
+    CommandContribution
+{
+  @inject(ILogger)
+  protected logger: ILogger;
+
+  @inject(MessageService)
+  protected messageService: MessageService;
+
+  @inject(BoardsService)
+  protected boardsService: BoardsService;
+
+  @inject(CommandService)
+  protected commandService: CommandService;
+
+  @inject(NotificationCenter)
+  protected notificationCenter: NotificationCenter;
+
+  @inject(FrontendApplicationStateService)
+  private readonly appStateService: FrontendApplicationStateService;
+
+  protected readonly onBoardsConfigChangedEmitter =
+    new Emitter<BoardsConfig.Config>();
+  protected readonly onAvailableBoardsChangedEmitter = new Emitter<
+    AvailableBoard[]
+  >();
+  protected readonly onAvailablePortsChangedEmitter = new Emitter<{
+    newState: Port[];
+    oldState: Port[];
+  }>();
+  private readonly inheritedConfig = new Deferred<BoardsConfig.Config>();
+
+  /**
+   * Used for the auto-reconnecting. Sometimes, the attached board gets disconnected after uploading something to it.
+   * It happens with certain boards on Windows. For example, the `MKR1000` boards is selected on post `COM5` on Windows,
+   * perform an upload, the board automatically disconnects and reconnects, but on another port, `COM10`.
+   * We have to listen on such changes and auto-reconnect the same board on another port.
+   * See: https://arduino.slack.com/archives/CJJHJCJSJ/p1568645417013000?thread_ts=1568640504.009400&cid=CJJHJCJSJ
+   */
+  protected latestValidBoardsConfig:
+    | RecursiveRequired<BoardsConfig.Config>
+    | undefined = undefined;
+  protected latestBoardsConfig: BoardsConfig.Config | undefined = undefined;
+  protected _boardsConfig: BoardsConfig.Config = {};
+  protected _attachedBoards: Board[] = []; // This does not contain the `Unknown` boards. They're visible from the available ports only.
+  protected _availablePorts: Port[] = [];
+  protected _availableBoards: AvailableBoard[] = [];
+
+  private lastBoardsConfigOnUpload: BoardsConfig.Config | undefined;
+  private lastAvailablePortsOnUpload: Port[] | undefined;
+  private boardConfigToAutoSelect: BoardsConfig.Config | undefined;
+
+  /**
+   * Unlike `onAttachedBoardsChanged` this event fires when the user modifies the selected board in the IDE.\
+   * This event also fires, when the boards package was not available for the currently selected board,
+   * and the user installs the board package. Note: installing a board package will set the `fqbn` of the
+   * currently selected board.
+   *
+   * This event is also emitted when the board package for the currently selected board was uninstalled.
+   */
+  readonly onBoardsConfigChanged = this.onBoardsConfigChangedEmitter.event;
+  readonly onAvailableBoardsChanged =
+    this.onAvailableBoardsChangedEmitter.event;
+  readonly onAvailablePortsChanged = this.onAvailablePortsChangedEmitter.event;
+
+  private readonly _reconciled = new Deferred<void>();
+
+  onStart(): void {
+    this.notificationCenter.onAttachedBoardsDidChange(
+      this.notifyAttachedBoardsChanged.bind(this)
+    );
+    this.notificationCenter.onPlatformDidInstall(
+      this.notifyPlatformInstalled.bind(this)
+    );
+    this.notificationCenter.onPlatformDidUninstall(
+      this.notifyPlatformUninstalled.bind(this)
+    );
+
+    this.appStateService.reachedState('ready').then(async () => {
+      const [state] = await Promise.all([
+        this.boardsService.getState(),
+        this.loadState(),
+      ]);
+      const { boards: attachedBoards, ports: availablePorts } =
+        AvailablePorts.split(state);
+      this._attachedBoards = attachedBoards;
+      const oldState = this._availablePorts.slice();
+      this._availablePorts = availablePorts;
+      this.onAvailablePortsChangedEmitter.fire({
+        newState: this._availablePorts.slice(),
+        oldState,
+      });
+
+      await this.reconcileAvailableBoards();
+
+      this.tryReconnect();
+      this._reconciled.resolve();
+    });
+  }
+
+  registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(USE_INHERITED_CONFIG, {
+      execute: (inheritedConfig: BoardsConfig.Config) =>
+        this.inheritedConfig.resolve(inheritedConfig),
+    });
+  }
+
+  get reconciled(): Promise<void> {
+    return this._reconciled.promise;
+  }
+
+  snapshotBoardDiscoveryOnUpload(): void {
+    this.lastBoardsConfigOnUpload = this._boardsConfig;
+    this.lastAvailablePortsOnUpload = this._availablePorts;
+  }
+
+  clearBoardDiscoverySnapshot(): void {
+    this.lastBoardsConfigOnUpload = undefined;
+    this.lastAvailablePortsOnUpload = undefined;
+  }
+
+  private portToAutoSelectCanBeDerived(): boolean {
+    return Boolean(
+      this.lastBoardsConfigOnUpload && this.lastAvailablePortsOnUpload
+    );
+  }
+
+  attemptPostUploadAutoSelect(): void {
+    setTimeout(() => {
+      if (this.portToAutoSelectCanBeDerived()) {
+        this.attemptAutoSelect({
+          ports: this._availablePorts,
+          boards: this._availableBoards,
+        });
+      }
+    }, 2000); // 2 second delay same as IDE 1.8
+  }
+
+  private attemptAutoSelect(
+    newState: AttachedBoardsChangeEvent['newState']
+  ): void {
+    this.deriveBoardConfigToAutoSelect(newState);
+    this.tryReconnect();
+  }
+
+  private deriveBoardConfigToAutoSelect(
+    newState: AttachedBoardsChangeEvent['newState']
+  ): void {
+    if (!this.portToAutoSelectCanBeDerived()) {
+      this.boardConfigToAutoSelect = undefined;
+      return;
+    }
+
+    const oldPorts = this.lastAvailablePortsOnUpload!;
+    const { ports: newPorts, boards: newBoards } = newState;
+
+    const appearedPorts =
+      oldPorts.length > 0
+        ? newPorts.filter((newPort: Port) =>
+            oldPorts.every((oldPort: Port) => !Port.sameAs(newPort, oldPort))
+          )
+        : newPorts;
+
+    for (const port of appearedPorts) {
+      const boardOnAppearedPort = newBoards.find((board: Board) =>
+        Port.sameAs(board.port, port)
+      );
+
+      const lastBoardsConfigOnUpload = this.lastBoardsConfigOnUpload!;
+
+      if (
+        boardOnAppearedPort &&
+        lastBoardsConfigOnUpload.selectedBoard &&
+        Board.sameAs(
+          boardOnAppearedPort,
+          lastBoardsConfigOnUpload.selectedBoard
+        )
+      ) {
+        this.clearBoardDiscoverySnapshot();
+
+        this.boardConfigToAutoSelect = {
+          selectedBoard: boardOnAppearedPort,
+          selectedPort: port,
+        };
+        return;
+      }
+    }
+  }
+
+  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;
+    const oldState = this._availablePorts.slice();
+    this._availablePorts = event.newState.ports;
+    this.onAvailablePortsChangedEmitter.fire({
+      newState: this._availablePorts.slice(),
+      oldState,
+    });
+    this.reconcileAvailableBoards().then(() => {
+      const { uploadInProgress } = event;
+      // avoid attempting "auto-selection" while an
+      // upload is in progress
+      if (!uploadInProgress) {
+        this.attemptAutoSelect(event.newState);
+      }
+    });
+  }
+
+  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
+      ) {
+        const yes = nls.localize('vscode/extensionsUtils/yes', 'Yes');
+        this.messageService
+          .warn(
+            nls.localize(
+              'arduino/board/couldNotFindPreviouslySelected',
+              "Could not find previously selected board '{0}' in installed platform '{1}'. Please manually reselect the board you want to use. Do you want to reselect it now?",
+              selectedBoard.name,
+              event.item.name
+            ),
+            nls.localize('arduino/board/reselectLater', 'Reselect later'),
+            yes
+          )
+          .then(async (answer) => {
+            if (answer === yes) {
+              this.commandService.executeCommand(
+                'arduino-open-boards-dialog',
+                selectedBoard.name
+              );
+            }
+          });
+        this.boardsConfig = {};
+        return;
+      }
+      // Trigger a board re-set. See: https://github.com/arduino/arduino-cli/issues/954
+      // E.g: install `adafruit:avr`, then select `adafruit:avr:adafruit32u4` board, and finally install the required `arduino:avr`
+      this.boardsConfig = this.boardsConfig;
+    }
+  }
+
+  protected notifyPlatformUninstalled(event: { item: BoardsPackage }): void {
+    this.logger.info('Boards package uninstalled: ', JSON.stringify(event));
+    const { selectedBoard } = this.boardsConfig;
+    if (selectedBoard && selectedBoard.fqbn) {
+      const uninstalledBoard = event.item.boards.find(
+        ({ name }) => name === selectedBoard.name
+      );
+      if (uninstalledBoard && uninstalledBoard.fqbn === selectedBoard.fqbn) {
+        // We should not unset the FQBN, if the selected board is an attached, recognized board.
+        // Attach Uno and install AVR, select Uno. Uninstall the AVR core while Uno is selected. We do not want to discard the FQBN of the Uno board.
+        // Dev note: We cannot assume the `selectedBoard` is a type of `AvailableBoard`.
+        // When the user selects an `AvailableBoard` it works, but between app start/stops,
+        // it is just a FQBN, so we need to find the `selected` board among the `AvailableBoards`
+        const selectedAvailableBoard = AvailableBoard.is(selectedBoard)
+          ? selectedBoard
+          : this._availableBoards.find((availableBoard) =>
+              Board.sameAs(availableBoard, selectedBoard)
+            );
+        if (
+          selectedAvailableBoard &&
+          selectedAvailableBoard.selected &&
+          selectedAvailableBoard.state === AvailableBoard.State.recognized
+        ) {
+          return;
+        }
+        this.logger.info(
+          `Board package ${event.item.id} was uninstalled. Discarding the FQBN of the currently selected ${selectedBoard.name} board.`
+        );
+        const selectedBoardWithoutFqbn = {
+          name: selectedBoard.name,
+          // No FQBN
+        };
+        this.boardsConfig = {
+          ...this.boardsConfig,
+          selectedBoard: selectedBoardWithoutFqbn,
+        };
+      }
+    }
+  }
+
+  protected tryReconnect(): boolean {
+    if (this.latestValidBoardsConfig && !this.canUploadTo(this.boardsConfig)) {
+      for (const board of this.availableBoards.filter(
+        ({ state }) => state !== AvailableBoard.State.incomplete
+      )) {
+        if (
+          this.latestValidBoardsConfig.selectedBoard.fqbn === board.fqbn &&
+          this.latestValidBoardsConfig.selectedBoard.name === board.name &&
+          Port.sameAs(this.latestValidBoardsConfig.selectedPort, board.port)
+        ) {
+          this.boardsConfig = this.latestValidBoardsConfig;
+          return true;
+        }
+      }
+
+      if (!this.boardConfigToAutoSelect) return false;
+
+      this.boardsConfig = this.boardConfigToAutoSelect;
+      this.boardConfigToAutoSelect = undefined;
+      return true;
+    }
+    return false;
+  }
+
+  set boardsConfig(config: BoardsConfig.Config) {
+    this.setBoardsConfig(config);
+    this.saveState().finally(() =>
+      this.reconcileAvailableBoards().finally(() =>
+        this.onBoardsConfigChangedEmitter.fire(this._boardsConfig)
+      )
+    );
+  }
+
+  get boardsConfig(): BoardsConfig.Config {
+    return this._boardsConfig;
+  }
+
+  protected setBoardsConfig(config: BoardsConfig.Config): void {
+    this.logger.debug('Board config changed: ', JSON.stringify(config));
+    this._boardsConfig = config;
+    this.latestBoardsConfig = this._boardsConfig;
+    if (this.canUploadTo(this._boardsConfig)) {
+      this.latestValidBoardsConfig = this._boardsConfig;
+    }
+  }
+
+  async searchBoards({
+    query,
+    cores,
+  }: {
+    query?: string;
+    cores?: string[];
+  }): Promise<BoardWithPackage[]> {
+    const boards = await this.boardsService.searchBoards({ query });
+    return boards;
+  }
+
+  async selectedBoardUserFields(): Promise<BoardUserField[]> {
+    if (!this._boardsConfig.selectedBoard) {
+      return [];
+    }
+    const fqbn = this._boardsConfig.selectedBoard.fqbn;
+    if (!fqbn) {
+      return [];
+    }
+    // Protocol must be set to `default` when uploading without a port selected:
+    // https://arduino.github.io/arduino-cli/dev/platform-specification/#sketch-upload-configuration
+    const protocol = this._boardsConfig.selectedPort?.protocol || 'default';
+    return await this.boardsService.getBoardUserFields({ fqbn, protocol });
+  }
+
+  /**
+   * `true` if the `config.selectedBoard` is defined; hence can compile against the board. Otherwise, `false`.
+   */
+  canVerify(
+    config: BoardsConfig.Config | undefined = this.boardsConfig,
+    options: { silent: boolean } = { silent: true }
+  ): config is BoardsConfig.Config & { selectedBoard: Board } {
+    if (!config) {
+      return false;
+    }
+
+    if (!config.selectedBoard) {
+      if (!options.silent) {
+        this.messageService.warn(
+          nls.localize('arduino/board/noneSelected', 'No boards selected.'),
+          {
+            timeout: 3000,
+          }
+        );
+      }
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * `true` if `canVerify`, the board has an FQBN and the `config.selectedPort` is also set, hence can upload to board. Otherwise, `false`.
+   */
+  canUploadTo(
+    config: BoardsConfig.Config | undefined = this.boardsConfig,
+    options: { silent: boolean } = { silent: true }
+  ): config is RecursiveRequired<BoardsConfig.Config> {
+    if (!this.canVerify(config, options)) {
+      return false;
+    }
+
+    const { name } = config.selectedBoard;
+    if (!config.selectedPort) {
+      if (!options.silent) {
+        this.messageService.warn(
+          nls.localize(
+            'arduino/board/noPortsSelected',
+            "No ports selected for board: '{0}'.",
+            name
+          ),
+          {
+            timeout: 3000,
+          }
+        );
+      }
+      return false;
+    }
+
+    if (!config.selectedBoard.fqbn) {
+      if (!options.silent) {
+        this.messageService.warn(
+          nls.localize(
+            'arduino/board/noFQBN',
+            'The FQBN is not available for the selected board "{0}". Do you have the corresponding core installed?',
+            name
+          ),
+          { timeout: 3000 }
+        );
+      }
+      return false;
+    }
+
+    return true;
+  }
+
+  get availableBoards(): AvailableBoard[] {
+    return this._availableBoards;
+  }
+
+  /**
+   * @deprecated Do not use this API, it will be removed. This is a hack to be able to set the missing port `properties` before an upload.
+   *
+   * See: https://github.com/arduino/arduino-ide/pull/1335#issuecomment-1224355236.
+   */
+  // TODO: remove this API and fix the selected board config store/restore correctly.
+  get availablePorts(): Port[] {
+    return this._availablePorts.slice();
+  }
+
+  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.sameAs(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 availablePorts = this._availablePorts;
+    // Unset the port on the user's config, if it is not available anymore.
+    if (
+      this.boardsConfig.selectedPort &&
+      !availablePorts.some((port) =>
+        Port.sameAs(port, this.boardsConfig.selectedPort)
+      )
+    ) {
+      this.setBoardsConfig({
+        selectedBoard: this.boardsConfig.selectedBoard,
+        selectedPort: undefined,
+      });
+      this.onBoardsConfigChangedEmitter.fire(this._boardsConfig);
+    }
+    const boardsConfig = this.boardsConfig;
+    const currentAvailableBoards = this._availableBoards;
+    const availableBoards: AvailableBoard[] = [];
+    const attachedBoards = this._attachedBoards.filter(({ port }) => !!port);
+    const availableBoardPorts = availablePorts.filter(
+      Port.visiblePorts(attachedBoards)
+    );
+
+    for (const boardPort of availableBoardPorts) {
+      const board = attachedBoards.find(({ port }) =>
+        Port.sameAs(boardPort, port)
+      );
+      // "board" will always be falsey for
+      // port that was originally mapped
+      // to unknown board and then selected
+      // manually by user
+
+      const lastSelectedBoard = await this.getLastSelectedBoardOnPort(
+        boardPort
+      );
+
+      let availableBoard = {} as AvailableBoard;
+      if (board) {
+        availableBoard = {
+          ...board,
+          state: AvailableBoard.State.recognized,
+          selected: BoardsConfig.Config.sameAs(boardsConfig, board),
+          port: boardPort,
+        };
+      } else if (lastSelectedBoard) {
+        // If the selected board is not recognized because it is a 3rd party board: https://github.com/arduino/arduino-cli/issues/623
+        // We still want to show it without the red X in the boards toolbar: https://github.com/arduino/arduino-pro-ide/issues/198#issuecomment-599355836
+        availableBoard = {
+          ...lastSelectedBoard,
+          state: AvailableBoard.State.guessed,
+          selected:
+            BoardsConfig.Config.sameAs(boardsConfig, lastSelectedBoard) &&
+            Port.sameAs(boardPort, boardsConfig.selectedPort), // to avoid double selection
+          port: boardPort,
+        };
+      } else {
+        availableBoard = {
+          name: Unknown,
+          port: boardPort,
+          state: AvailableBoard.State.incomplete,
+        };
+      }
+      availableBoards.push(availableBoard);
+    }
+
+    if (
+      boardsConfig.selectedBoard &&
+      availableBoards.every(({ selected }) => !selected)
+    ) {
+      let port = boardsConfig.selectedPort;
+      // If the selected board has the same port of an unknown board
+      // that is already in availableBoards we might get a duplicate port.
+      // So we remove the one already in the array and add the selected one.
+      const found = availableBoards.findIndex(
+        (board) => board.port?.address === boardsConfig.selectedPort?.address
+      );
+      if (found >= 0) {
+        // get the "Unknown board port" that we will substitute,
+        // then we can include it in the "availableBoard object"
+        // pushed below; to ensure addressLabel is included
+        port = availableBoards[found].port;
+        availableBoards.splice(found, 1);
+      }
+      availableBoards.push({
+        ...boardsConfig.selectedBoard,
+        port,
+        selected: true,
+        state: AvailableBoard.State.incomplete,
+      });
+    }
+
+    availableBoards.sort(AvailableBoard.compare);
+
+    let hasChanged = availableBoards.length !== currentAvailableBoards.length;
+    for (let i = 0; !hasChanged && i < availableBoards.length; i++) {
+      const [left, right] = [availableBoards[i], currentAvailableBoards[i]];
+      hasChanged =
+        left.fqbn !== right.fqbn ||
+        !!AvailableBoard.compare(left, right) ||
+        left.selected !== right.selected;
+    }
+    if (hasChanged) {
+      this._availableBoards = availableBoards;
+      this.onAvailableBoardsChangedEmitter.fire(this._availableBoards);
+    }
+  }
+
+  protected async getLastSelectedBoardOnPort(
+    port: Port
+  ): Promise<Board | undefined> {
+    const key = this.getLastSelectedBoardOnPortKey(port);
+    return this.getData<Board>(key);
+  }
+
+  protected async saveState(): Promise<void> {
+    // We save the port with the selected board name/FQBN, to be able to guess a better board name.
+    // Required when the attached board belongs to a 3rd party boards package, and neither the name, nor
+    // the FQBN can be retrieved with a `board list` command.
+    // https://github.com/arduino/arduino-cli/issues/623
+    const { selectedBoard, selectedPort } = this.boardsConfig;
+    if (selectedBoard && selectedPort) {
+      const key = this.getLastSelectedBoardOnPortKey(selectedPort);
+      await this.setData(key, selectedBoard);
+    }
+    await Promise.all([
+      this.setData('latest-valid-boards-config', this.latestValidBoardsConfig),
+      this.setData('latest-boards-config', this.latestBoardsConfig),
+    ]);
+  }
+
+  protected getLastSelectedBoardOnPortKey(port: Port | string): string {
+    // TODO: we lose the port's `protocol` info (`serial`, `network`, etc.) here if the `port` is a `string`.
+    return `last-selected-board-on-port:${
+      typeof port === 'string' ? port : port.address
+    }`;
+  }
+
+  protected async loadState(): Promise<void> {
+    const storedLatestValidBoardsConfig = await this.getData<
+      RecursiveRequired<BoardsConfig.Config>
+    >('latest-valid-boards-config');
+    if (storedLatestValidBoardsConfig) {
+      this.latestValidBoardsConfig = storedLatestValidBoardsConfig;
+      if (this.canUploadTo(this.latestValidBoardsConfig)) {
+        this.boardsConfig = this.latestValidBoardsConfig;
+      }
+    } else {
+      // If we could not restore the latest valid config, try to restore something, the board at least.
+      let storedLatestBoardsConfig = await this.getData<
+        BoardsConfig.Config | undefined
+      >('latest-boards-config');
+      // Try to get from the startup task. Wait for it, then timeout. Maybe it never arrives.
+      if (!storedLatestBoardsConfig) {
+        storedLatestBoardsConfig = await Promise.race([
+          this.inheritedConfig.promise,
+          new Promise<undefined>((resolve) =>
+            setTimeout(() => resolve(undefined), 2_000)
+          ),
+        ]);
+      }
+      if (storedLatestBoardsConfig) {
+        this.latestBoardsConfig = storedLatestBoardsConfig;
+        this.boardsConfig = this.latestBoardsConfig;
+      }
+    }
+  }
+
+  private setData<T>(key: string, value: T): Promise<void> {
+    return this.commandService.executeCommand(
+      StorageWrapper.Commands.SET_DATA.id,
+      key,
+      value
+    );
+  }
+
+  private getData<T>(key: string): Promise<T | undefined> {
+    return this.commandService.executeCommand<T>(
+      StorageWrapper.Commands.GET_DATA.id,
+      key
+    );
+  }
+
+  tasks(): StartupTask[] {
+    return [
+      {
+        command: USE_INHERITED_CONFIG.id,
+        args: [this.boardsConfig],
+      },
+    ];
+  }
+}
+
+/**
+ * It should be neither visible nor called from outside.
+ *
+ * This service creates a startup task with the current board config and
+ * passes the task to the electron-main process so that the new window
+ * can inherit the boards config state of this service.
+ *
+ * Note that the state is always set, but new windows might ignore it.
+ * For example, the new window already has a valid boards config persisted to the local storage.
+ */
+const USE_INHERITED_CONFIG: Command = {
+  id: 'arduino-use-inherited-boards-config',
+};
+
+/**
+ * Representation of a ready-to-use board, either the user has configured it or was automatically recognized by the CLI.
+ * An available board was not necessarily recognized by the CLI (e.g.: it is a 3rd party board) or correctly configured but ready for `verify`.
+ * If it has the selected board and a associated port, it can be used for `upload`. We render an available board for the user
+ * when it has the `port` set.
+ */
+export interface AvailableBoard extends Board {
+  readonly state: AvailableBoard.State;
+  readonly selected?: boolean;
+  readonly port?: Port;
+}
+
+export namespace AvailableBoard {
+  export enum State {
+    /**
+     * Retrieved from the CLI via the `board list` command.
+     */
+    'recognized',
+    /**
+     * Guessed the name/FQBN of the board from the available board ports (3rd party).
+     */
+    'guessed',
+    /**
+     * We do not know anything about this board, probably a 3rd party. The user has not selected a board for this port yet.
+     */
+    'incomplete',
+  }
+
+  export function is(board: any): board is AvailableBoard {
+    return Board.is(board) && 'state' in board;
+  }
+
+  export function hasPort(
+    board: AvailableBoard
+  ): board is AvailableBoard & { port: Port } {
+    return !!board.port;
+  }
+
+  // Available boards must be sorted in this order:
+  // 1. Serial with recognized boards
+  // 2. Serial with guessed boards
+  // 3. Serial with incomplete boards
+  // 4. Network with recognized boards
+  // 5. Other protocols with recognized boards
+  export const compare = (left: AvailableBoard, right: AvailableBoard) => {
+    if (left.port?.protocol === 'serial' && right.port?.protocol !== 'serial') {
+      return -1;
+    } else if (
+      left.port?.protocol !== 'serial' &&
+      right.port?.protocol === 'serial'
+    ) {
+      return 1;
+    } else if (
+      left.port?.protocol === 'network' &&
+      right.port?.protocol !== 'network'
+    ) {
+      return -1;
+    } else if (
+      left.port?.protocol !== 'network' &&
+      right.port?.protocol === 'network'
+    ) {
+      return 1;
+    } else if (left.port?.protocol === right.port?.protocol) {
+      // We show all ports, including those that have guessed
+      // or unrecognized boards, so we must sort those too.
+      if (left.state < right.state) {
+        return -1;
+      } else if (left.state > right.state) {
+        return 1;
+      }
+    }
+    return naturalCompare(left.port?.address!, right.port?.address!);
+  };
+}

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

@@ -1,193 +1,322 @@
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
+import * as React from '@theia/core/shared/react';
+import * as ReactDOM from '@theia/core/shared/react-dom';
 import { CommandRegistry } from '@theia/core/lib/common/command';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Port } from '../../common/protocol';
+import { OpenBoardsConfig } from '../contributions/open-boards-config';
+import {
+  BoardsServiceProvider,
+  AvailableBoard,
+} from './boards-service-provider';
+import { nls } from '@theia/core/lib/common';
+import classNames from 'classnames';
 import { BoardsConfig } from './boards-config';
-import { ArduinoCommands } from '../arduino-commands';
-import { BoardsServiceClientImpl, AvailableBoard } from './boards-service-client-impl';
 
 export interface BoardsDropDownListCoords {
-    readonly top: number;
-    readonly left: number;
-    readonly width: number;
-    readonly paddingTop: number;
+  readonly top: number;
+  readonly left: number;
+  readonly width: number;
+  readonly paddingTop: number;
 }
 
 export namespace BoardsDropDown {
-    export interface Props {
-        readonly coords: BoardsDropDownListCoords | 'hidden';
-        readonly items: Array<AvailableBoard & { onClick: () => void, port: Port }>;
-        readonly openBoardsConfig: () => void;
-    }
+  export interface Props {
+    readonly coords: BoardsDropDownListCoords | 'hidden';
+    readonly items: Array<AvailableBoard & { onClick: () => void; port: Port }>;
+    readonly openBoardsConfig: () => void;
+  }
 }
 
 export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
+  protected dropdownElement: HTMLElement;
+  private listRef: React.RefObject<HTMLDivElement>;
 
-    protected dropdownElement: HTMLElement;
+  constructor(props: BoardsDropDown.Props) {
+    super(props);
 
-    constructor(props: BoardsDropDown.Props) {
-        super(props);
-
-        let list = document.getElementById('boards-dropdown-container');
-        if (!list) {
-            list = document.createElement('div');
-            list.id = 'boards-dropdown-container';
-            document.body.appendChild(list);
-            this.dropdownElement = list;
-        }
+    this.listRef = React.createRef();
+    let list = document.getElementById('boards-dropdown-container');
+    if (!list) {
+      list = document.createElement('div');
+      list.id = 'boards-dropdown-container';
+      document.body.appendChild(list);
+      this.dropdownElement = list;
     }
+  }
 
-    render(): React.ReactNode {
-        return ReactDOM.createPortal(this.renderNode(), this.dropdownElement);
+  override componentDidUpdate(prevProps: BoardsDropDown.Props): void {
+    if (prevProps.coords === 'hidden' && this.listRef.current) {
+      this.listRef.current.focus();
     }
+  }
 
-    protected renderNode(): React.ReactNode {
-        const { coords, items } = this.props;
-        if (coords === 'hidden') {
-            return '';
-        }
-        return <div className='arduino-boards-dropdown-list'
-            style={{
-                position: 'absolute',
-                ...coords
-            }}>
-            {this.renderItem({
-                label: 'Select Other Board & Port',
-                onClick: () => this.props.openBoardsConfig()
-            })}
-            {items.map(({ name, port, selected, onClick }) => ({ label: `${name} at ${Port.toString(port)}`, selected, onClick })).map(this.renderItem)}
+  override render(): React.ReactNode {
+    return ReactDOM.createPortal(this.renderNode(), this.dropdownElement);
+  }
+
+  protected renderNode(): React.ReactNode {
+    const { coords, items } = this.props;
+    if (coords === 'hidden') {
+      return '';
+    }
+    const footerLabel = nls.localize(
+      'arduino/board/openBoardsConfig',
+      'Select other board and port…'
+    );
+    return (
+      <div
+        className="arduino-boards-dropdown-list"
+        style={{
+          position: 'absolute',
+          ...coords,
+        }}
+        ref={this.listRef}
+        tabIndex={0}
+      >
+        <div className="arduino-boards-dropdown-list--items-container">
+          {items
+            .map(({ name, port, selected, onClick }) => ({
+              boardLabel: name,
+              port,
+              selected,
+              onClick,
+            }))
+            .map(this.renderItem)}
         </div>
-    }
-
-    protected renderItem({ label, selected, onClick }: { label: string, selected?: boolean, onClick: () => void }): React.ReactNode {
-        return <div key={label} className={`arduino-boards-dropdown-item ${selected ? 'selected' : ''}`} onClick={onClick}>
-            <div>
-                {label}
-            </div>
-            {selected ? <span className='fa fa-check' /> : ''}
+        <div
+          key={footerLabel}
+          tabIndex={0}
+          className="arduino-boards-dropdown-item arduino-board-dropdown-footer"
+          onClick={() => this.props.openBoardsConfig()}
+        >
+          <div>{footerLabel}</div>
         </div>
-    }
+      </div>
+    );
+  }
 
+  protected renderItem({
+    boardLabel,
+    port,
+    selected,
+    onClick,
+  }: {
+    boardLabel: string;
+    port: Port;
+    selected?: boolean;
+    onClick: () => void;
+  }): React.ReactNode {
+    const protocolIcon = iconNameFromProtocol(port.protocol);
+    const onKeyUp = (e: React.KeyboardEvent) => {
+      if (e.key === 'Enter') {
+        onClick();
+      }
+    };
+
+    return (
+      <div
+        key={`board-item--${boardLabel}-${port.address}`}
+        className={classNames('arduino-boards-dropdown-item', {
+          'arduino-boards-dropdown-item--selected': selected,
+        })}
+        onClick={onClick}
+        onKeyUp={onKeyUp}
+        tabIndex={0}
+      >
+        <div
+          className={classNames(
+            'arduino-boards-dropdown-item--protocol',
+            'fa',
+            protocolIcon
+          )}
+        />
+        <div
+          className="arduino-boards-dropdown-item--label"
+          title={`${boardLabel}\n${port.address}`}
+        >
+          <div className="arduino-boards-dropdown-item--board-label noWrapInfo noselect">
+            {boardLabel}
+          </div>
+          <div className="arduino-boards-dropdown-item--port-label noWrapInfo noselect">
+            {port.addressLabel}
+          </div>
+        </div>
+        {selected ? <div className="fa fa-check" /> : ''}
+      </div>
+    );
+  }
 }
 
-export class BoardsToolBarItem extends React.Component<BoardsToolBarItem.Props, BoardsToolBarItem.State> {
+export class BoardsToolBarItem extends React.Component<
+  BoardsToolBarItem.Props,
+  BoardsToolBarItem.State
+> {
+  static TOOLBAR_ID: 'boards-toolbar';
 
-    static TOOLBAR_ID: 'boards-toolbar';
+  protected readonly toDispose: DisposableCollection =
+    new DisposableCollection();
 
-    protected readonly toDispose: DisposableCollection = new DisposableCollection();
+  constructor(props: BoardsToolBarItem.Props) {
+    super(props);
 
-    constructor(props: BoardsToolBarItem.Props) {
-        super(props);
+    const { availableBoards } = props.boardsServiceProvider;
+    this.state = {
+      availableBoards,
+      coords: 'hidden',
+    };
 
-        const { availableBoards } = props.boardsServiceClient;
-        this.state = {
-            availableBoards,
-            coords: 'hidden'
-        };
+    document.addEventListener('click', () => {
+      this.setState({ coords: 'hidden' });
+    });
+  }
 
-        document.addEventListener('click', () => {
-            this.setState({ coords: 'hidden' });
+  override componentDidMount(): void {
+    this.props.boardsServiceProvider.onAvailableBoardsChanged(
+      (availableBoards) => this.setState({ availableBoards })
+    );
+  }
+
+  override componentWillUnmount(): void {
+    this.toDispose.dispose();
+  }
+
+  protected readonly show = (event: React.MouseEvent<HTMLElement>): void => {
+    const { currentTarget: element } = event;
+    if (element instanceof HTMLElement) {
+      if (this.state.coords === 'hidden') {
+        const rect = element.getBoundingClientRect();
+        this.setState({
+          coords: {
+            top: rect.top,
+            left: rect.left,
+            width: rect.width,
+            paddingTop: rect.height,
+          },
         });
-    }
-
-    componentDidMount() {
-        this.props.boardsServiceClient.onAvailableBoardsChanged(availableBoards => this.setState({ availableBoards }));
-    }
-
-    componentWillUnmount(): void {
-        this.toDispose.dispose();
-    }
-
-    protected readonly show = (event: React.MouseEvent<HTMLElement>) => {
-        const { currentTarget: element } = event;
-        if (element instanceof HTMLElement) {
-            if (this.state.coords === 'hidden') {
-                const rect = element.getBoundingClientRect();
-                this.setState({
-                    coords: {
-                        top: rect.top,
-                        left: rect.left,
-                        width: rect.width,
-                        paddingTop: rect.height
-                    }
-                });
-            } else {
-                this.setState({ coords: 'hidden' });
-            }
-        }
-        event.stopPropagation();
-        event.nativeEvent.stopImmediatePropagation();
-    };
-
-    render(): React.ReactNode {
-        const { coords, availableBoards } = this.state;
-        const boardsConfig = this.props.boardsServiceClient.boardsConfig;
-        const title = BoardsConfig.Config.toString(boardsConfig, { default: 'no board selected' });
-        const decorator = (() => {
-            const selectedBoard = availableBoards.find(({ selected }) => selected);
-            if (!selectedBoard || !selectedBoard.port) {
-                return 'fa fa-times notAttached'
-            }
-            if (selectedBoard.state === AvailableBoard.State.guessed) {
-                return 'fa fa-exclamation-triangle guessed'
-            }
-            return ''
-        })();
-
-        return <React.Fragment>
-            <div className='arduino-boards-toolbar-item-container'>
-                <div className='arduino-boards-toolbar-item' title={title}>
-                    <div className='inner-container' onClick={this.show}>
-                        <span className={decorator} />
-                        <div className='label noWrapInfo'>
-                            <div className='noWrapInfo noselect'>
-                                {title}
-                            </div>
-                        </div>
-                        <span className='fa fa-caret-down caret' />
-                    </div>
-                </div>
-            </div>
-            <BoardsDropDown
-                coords={coords}
-                items={availableBoards.filter(AvailableBoard.hasPort).map(board => ({
-                    ...board,
-                    onClick: () => {
-                        if (board.state === AvailableBoard.State.incomplete) {
-                            this.props.boardsServiceClient.boardsConfig = {
-                                selectedPort: board.port
-                            };
-                            this.openDialog();
-                        } else {
-                            this.props.boardsServiceClient.boardsConfig = {
-                                selectedBoard: board,
-                                selectedPort: board.port
-                            }
-                        }
-                    }
-                }))}
-                openBoardsConfig={this.openDialog}>
-            </BoardsDropDown>
-        </React.Fragment>;
-    }
-
-    protected openDialog = () => {
-        this.props.commands.executeCommand(ArduinoCommands.OPEN_BOARDS_DIALOG.id);
+      } else {
         this.setState({ coords: 'hidden' });
-    };
+      }
+    }
+    event.stopPropagation();
+    event.nativeEvent.stopImmediatePropagation();
+  };
 
+  override render(): React.ReactNode {
+    const { coords, availableBoards } = this.state;
+    const { selectedBoard, selectedPort } =
+      this.props.boardsServiceProvider.boardsConfig;
+
+    const boardLabel =
+      selectedBoard?.name ||
+      nls.localize('arduino/board/selectBoard', 'Select Board');
+    const selectedPortLabel = portLabel(selectedPort?.address);
+
+    const isConnected = Boolean(selectedBoard && selectedPort);
+    const protocolIcon = isConnected
+      ? iconNameFromProtocol(selectedPort?.protocol || '')
+      : null;
+    const protocolIconClassNames = classNames(
+      'arduino-boards-toolbar-item--protocol',
+      'fa',
+      protocolIcon
+    );
+
+    return (
+      <React.Fragment>
+        <div
+          className="arduino-boards-toolbar-item-container"
+          title={selectedPortLabel}
+          onClick={this.show}
+        >
+          {protocolIcon && <div className={protocolIconClassNames} />}
+          <div
+            className={classNames(
+              'arduino-boards-toolbar-item--label',
+              'noWrapInfo',
+              'noselect',
+              { 'arduino-boards-toolbar-item--label-connected': isConnected }
+            )}
+          >
+            {boardLabel}
+          </div>
+          <div className="fa fa-caret-down caret" />
+        </div>
+        <BoardsDropDown
+          coords={coords}
+          items={availableBoards
+            .filter(AvailableBoard.hasPort)
+            .map((board) => ({
+              ...board,
+              onClick: () => {
+                if (!board.fqbn) {
+                  const previousBoardConfig =
+                    this.props.boardsServiceProvider.boardsConfig;
+                  this.props.boardsServiceProvider.boardsConfig = {
+                    selectedPort: board.port,
+                  };
+                  this.openDialog(previousBoardConfig);
+                } else {
+                  this.props.boardsServiceProvider.boardsConfig = {
+                    selectedBoard: board,
+                    selectedPort: board.port,
+                  };
+                }
+                this.setState({ coords: 'hidden' });
+              },
+            }))}
+          openBoardsConfig={this.openDialog}
+        ></BoardsDropDown>
+      </React.Fragment>
+    );
+  }
+
+  protected openDialog = async (
+    previousBoardConfig?: BoardsConfig.Config
+  ): Promise<void> => {
+    const selectedBoardConfig =
+      await this.props.commands.executeCommand<BoardsConfig.Config>(
+        OpenBoardsConfig.Commands.OPEN_DIALOG.id
+      );
+    if (
+      previousBoardConfig &&
+      (!selectedBoardConfig?.selectedPort ||
+        !selectedBoardConfig?.selectedBoard)
+    ) {
+      this.props.boardsServiceProvider.boardsConfig = previousBoardConfig;
+    }
+  };
 }
 export namespace BoardsToolBarItem {
+  export interface Props {
+    readonly boardsServiceProvider: BoardsServiceProvider;
+    readonly commands: CommandRegistry;
+  }
 
-    export interface Props {
-        readonly boardsServiceClient: BoardsServiceClientImpl;
-        readonly commands: CommandRegistry;
-    }
-
-    export interface State {
-        availableBoards: AvailableBoard[];
-        coords: BoardsDropDownListCoords | 'hidden';
-    }
-
+  export interface State {
+    availableBoards: AvailableBoard[];
+    coords: BoardsDropDownListCoords | 'hidden';
+  }
+}
+
+function iconNameFromProtocol(protocol: string): string {
+  switch (protocol) {
+    case 'serial':
+      return 'fa-arduino-technology-usb';
+    case 'network':
+      return 'fa-arduino-technology-connection';
+    /* 
+      Bluetooth ports are not listed yet from the CLI;
+      Not sure about the naming ('bluetooth'); make sure it's correct before uncommenting the following lines
+    */
+    // case 'bluetooth':
+    //   return 'fa-arduino-technology-bluetooth';
+    default:
+      return 'fa-arduino-technology-3dimensionscube';
+  }
+}
+
+function portLabel(portName?: string): string {
+  return portName
+    ? nls.localize('arduino/board/portLabel', 'Port: {0}', portName)
+    : nls.localize('arduino/board/disconnected', 'Disconnected');
 }

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

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

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

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

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

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

arduino-ide-extension/src/browser/components/ProgressBar.tsx

@@ -0,0 +1,28 @@
+import * as React from '@theia/core/shared/react';
+
+export type ProgressBarProps = {
+  percent?: number;
+  showPercentage?: boolean;
+};
+
+export default function ProgressBar({
+  percent = 0,
+  showPercentage = false,
+}: ProgressBarProps): React.ReactElement {
+  const roundedPercent = Math.round(percent);
+  return (
+    <div className="progress-bar">
+      <div className="progress-bar--outer">
+        <div
+          className="progress-bar--inner"
+          style={{ width: `${roundedPercent}%` }}
+        />
+      </div>
+      {showPercentage && (
+        <div className="progress-bar--percentage">
+          <div className="progress-bar--percentage-text">{roundedPercent}%</div>
+        </div>
+      )}
+    </div>
+  );
+}

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,190 @@
+import { inject, injectable } from '@theia/core/shared/inversify';
+import * as moment from 'moment';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
+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';
+import { nls } from '@theia/core/lib/common';
+
+@injectable()
+export class About extends Contribution {
+  @inject(ClipboardService)
+  protected readonly clipboardService: ClipboardService;
+
+  @inject(ConfigService)
+  protected readonly configService: ConfigService;
+
+  override registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(About.Commands.ABOUT_APP, {
+      execute: () => this.showAbout(),
+    });
+  }
+
+  override registerMenus(registry: MenuModelRegistry): void {
+    registry.registerMenuAction(ArduinoMenus.HELP__ABOUT_GROUP, {
+      commandId: About.Commands.ABOUT_APP.id,
+      label: nls.localize(
+        'arduino/about/label',
+        'About {0}',
+        this.applicationName
+      ),
+      order: '0',
+    });
+  }
+
+  async showAbout(): Promise<void> {
+    const {
+      version,
+      commit,
+      status: cliStatus,
+    } = await this.configService.getVersion();
+    const buildDate = this.buildDate;
+    const detail = (showAll: boolean) =>
+      nls.localize(
+        'arduino/about/detail',
+        'Version: {0}\nDate: {1}{2}\nCLI Version: {3}{4} [{5}]\n\n{6}',
+        remote.app.getVersion(),
+        buildDate ? buildDate : nls.localize('', 'dev build'),
+        buildDate && showAll ? ` (${this.ago(buildDate)})` : '',
+        version,
+        cliStatus ? ` ${cliStatus}` : '',
+        commit,
+        nls.localize(
+          'arduino/about/copyright',
+          'Copyright © {0} Arduino SA',
+          new Date().getFullYear().toString()
+        )
+      );
+    const ok = nls.localize('vscode/issueMainService/ok', 'OK');
+    const copy = nls.localize('vscode/textInputActions/copy', 'Copy');
+    const buttons = !isWindows && !isOSX ? [copy, ok] : [ok, copy];
+    const { response } = await remote.dialog.showMessageBox(
+      remote.getCurrentWindow(),
+      {
+        message: `${this.applicationName}`,
+        title: `${this.applicationName}`,
+        type: 'info',
+        detail: detail(true),
+        buttons,
+        noLink: true,
+        defaultId: buttons.indexOf(ok),
+        cancelId: buttons.indexOf(ok),
+      }
+    );
+
+    if (buttons[response] === copy) {
+      await this.clipboardService.writeText(detail(false).trim());
+    }
+  }
+
+  protected get applicationName(): string {
+    return FrontendApplicationConfigProvider.get().applicationName;
+  }
+
+  protected get buildDate(): string | undefined {
+    return FrontendApplicationConfigProvider.get().buildDate;
+  }
+
+  protected ago(isoTime: string): string {
+    const now = moment(Date.now());
+    const other = moment(isoTime);
+    let result = now.diff(other, 'minute');
+    if (result < 60) {
+      return result === 1
+        ? nls.localize(
+            'vscode/date/date.fromNow.minutes.singular.ago',
+            '{0} minute ago',
+            result.toString()
+          )
+        : nls.localize(
+            'vscode/date/date.fromNow.minutes.plural.ago',
+            '{0} minutes ago',
+            result.toString()
+          );
+    }
+    result = now.diff(other, 'hour');
+    if (result < 25) {
+      return result === 1
+        ? nls.localize(
+            'vscode/date/date.fromNow.hours.singular.ago',
+            '{0} hour ago',
+            result.toString()
+          )
+        : nls.localize(
+            'vscode/date/date.fromNow.hours.plural.ago',
+            '{0} hours ago',
+            result.toString()
+          );
+    }
+    result = now.diff(other, 'day');
+    if (result < 8) {
+      return result === 1
+        ? nls.localize(
+            'vscode/date/date.fromNow.days.singular.ago',
+            '{0} day ago',
+            result.toString()
+          )
+        : nls.localize(
+            'vscode/date/date.fromNow.days.plural.ago',
+            '{0} days ago',
+            result.toString()
+          );
+    }
+    result = now.diff(other, 'week');
+    if (result < 5) {
+      return result === 1
+        ? nls.localize(
+            'vscode/date/date.fromNow.weeks.singular.ago',
+            '{0} week ago',
+            result.toString()
+          )
+        : nls.localize(
+            'vscode/date/date.fromNow.weeks.plural.ago',
+            '{0} weeks ago',
+            result.toString()
+          );
+    }
+    result = now.diff(other, 'month');
+    if (result < 13) {
+      return result === 1
+        ? nls.localize(
+            'vscode/date/date.fromNow.months.singular.ago',
+            '{0} month ago',
+            result.toString()
+          )
+        : nls.localize(
+            'vscode/date/date.fromNow.months.plural.ago',
+            '{0} months ago',
+            result.toString()
+          );
+    }
+    result = now.diff(other, 'year');
+    return result === 1
+      ? nls.localize(
+          'vscode/date/date.fromNow.years.singular.ago',
+          '{0} year ago',
+          result.toString()
+        )
+      : nls.localize(
+          'vscode/date/date.fromNow.years.plural.ago',
+          '{0} years ago',
+          result.toString()
+        );
+  }
+}
+
+export namespace About {
+  export namespace Commands {
+    export const ABOUT_APP: Command = {
+      id: 'arduino-about',
+    };
+  }
+}

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

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

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

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

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

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

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

@@ -0,0 +1,372 @@
+import { inject, injectable } from '@theia/core/shared/inversify';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
+import { MenuModelRegistry } from '@theia/core/lib/common/menu';
+import {
+  DisposableCollection,
+  Disposable,
+} from '@theia/core/lib/common/disposable';
+import { BoardsConfig } from '../boards/boards-config';
+import { MainMenuManager } from '../../common/main-menu-manager';
+import { BoardsListWidget } from '../boards/boards-list-widget';
+import { NotificationCenter } from '../notification-center';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import {
+  ArduinoMenus,
+  PlaceholderMenuNode,
+  unregisterSubmenu,
+} from '../menu/arduino-menus';
+import {
+  BoardsService,
+  InstalledBoardWithPackage,
+  AvailablePorts,
+  Port,
+} from '../../common/protocol';
+import { SketchContribution, Command, CommandRegistry } from './contribution';
+import { nls } from '@theia/core/lib/common';
+
+@injectable()
+export class BoardSelection extends SketchContribution {
+  @inject(CommandRegistry)
+  protected readonly commandRegistry: CommandRegistry;
+
+  @inject(MainMenuManager)
+  protected readonly mainMenuManager: MainMenuManager;
+
+  @inject(MenuModelRegistry)
+  protected readonly menuModelRegistry: MenuModelRegistry;
+
+  @inject(NotificationCenter)
+  protected readonly notificationCenter: NotificationCenter;
+
+  @inject(BoardsService)
+  protected readonly boardsService: BoardsService;
+
+  @inject(BoardsServiceProvider)
+  protected readonly boardsServiceProvider: BoardsServiceProvider;
+
+  protected readonly toDisposeBeforeMenuRebuild = new DisposableCollection();
+
+  override registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(BoardSelection.Commands.GET_BOARD_INFO, {
+      execute: async () => {
+        const { selectedBoard, selectedPort } =
+          this.boardsServiceProvider.boardsConfig;
+        if (!selectedBoard) {
+          this.messageService.info(
+            nls.localize(
+              'arduino/board/selectBoardForInfo',
+              'Please select a board to obtain board info.'
+            )
+          );
+          return;
+        }
+        if (!selectedBoard.fqbn) {
+          this.messageService.info(
+            nls.localize(
+              'arduino/board/platformMissing',
+              "The platform for the selected '{0}' board is not installed.",
+              selectedBoard.name
+            )
+          );
+          return;
+        }
+        if (!selectedPort) {
+          this.messageService.info(
+            nls.localize(
+              'arduino/board/selectPortForInfo',
+              'Please select a port to obtain board info.'
+            )
+          );
+          return;
+        }
+        const boardDetails = await this.boardsService.getBoardDetails({
+          fqbn: selectedBoard.fqbn,
+        });
+        if (boardDetails) {
+          const { VID, PID } = boardDetails;
+          const detail = `BN: ${selectedBoard.name}
+VID: ${VID}
+PID: ${PID}`;
+          await remote.dialog.showMessageBox(remote.getCurrentWindow(), {
+            message: nls.localize('arduino/board/boardInfo', 'Board Info'),
+            title: nls.localize('arduino/board/boardInfo', 'Board Info'),
+            type: 'info',
+            detail,
+            buttons: [nls.localize('vscode/issueMainService/ok', 'OK')],
+          });
+        }
+      },
+    });
+  }
+
+  override onStart(): void {
+    this.notificationCenter.onPlatformDidInstall(() => this.updateMenus());
+    this.notificationCenter.onPlatformDidUninstall(() => this.updateMenus());
+    this.boardsServiceProvider.onBoardsConfigChanged(() => this.updateMenus());
+    this.boardsServiceProvider.onAvailableBoardsChanged(() =>
+      this.updateMenus()
+    );
+    this.boardsServiceProvider.onAvailablePortsChanged(() =>
+      this.updateMenus()
+    );
+  }
+
+  override async onReady(): Promise<void> {
+    this.updateMenus();
+  }
+
+  protected async updateMenus(): Promise<void> {
+    const [installedBoards, availablePorts, config] = await Promise.all([
+      this.installedBoards(),
+      this.boardsService.getState(),
+      this.boardsServiceProvider.boardsConfig,
+    ]);
+    this.rebuildMenus(installedBoards, availablePorts, config);
+  }
+
+  protected rebuildMenus(
+    installedBoards: InstalledBoardWithPackage[],
+    availablePorts: AvailablePorts,
+    config: BoardsConfig.Config
+  ): void {
+    this.toDisposeBeforeMenuRebuild.dispose();
+
+    // Boards submenu
+    const boardsSubmenuPath = [
+      ...ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP,
+      '1_boards',
+    ];
+    const boardsSubmenuLabel = config.selectedBoard?.name;
+    // Note: The submenu order starts from `100` because `Auto Format`, `Serial Monitor`, etc starts from `0` index.
+    // The board specific items, and the rest, have order with `z`. We needed something between `0` and `z` with natural-order.
+    this.menuModelRegistry.registerSubmenu(
+      boardsSubmenuPath,
+      nls.localize(
+        'arduino/board/board',
+        'Board{0}',
+        !!boardsSubmenuLabel ? `: "${boardsSubmenuLabel}"` : ''
+      ),
+      { order: '100' }
+    );
+    this.toDisposeBeforeMenuRebuild.push(
+      Disposable.create(() =>
+        unregisterSubmenu(boardsSubmenuPath, this.menuModelRegistry)
+      )
+    );
+
+    // Ports submenu
+    const portsSubmenuPath = [
+      ...ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP,
+      '2_ports',
+    ];
+    const portsSubmenuLabel = config.selectedPort?.address;
+    this.menuModelRegistry.registerSubmenu(
+      portsSubmenuPath,
+      nls.localize(
+        'arduino/board/port',
+        'Port{0}',
+        portsSubmenuLabel ? `: "${portsSubmenuLabel}"` : ''
+      ),
+      { order: '101' }
+    );
+    this.toDisposeBeforeMenuRebuild.push(
+      Disposable.create(() =>
+        unregisterSubmenu(portsSubmenuPath, this.menuModelRegistry)
+      )
+    );
+
+    const getBoardInfo = {
+      commandId: BoardSelection.Commands.GET_BOARD_INFO.id,
+      label: nls.localize('arduino/board/getBoardInfo', 'Get Board Info'),
+      order: '103',
+    };
+    this.menuModelRegistry.registerMenuAction(
+      ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP,
+      getBoardInfo
+    );
+    this.toDisposeBeforeMenuRebuild.push(
+      Disposable.create(() =>
+        this.menuModelRegistry.unregisterMenuAction(getBoardInfo)
+      )
+    );
+
+    const boardsManagerGroup = [...boardsSubmenuPath, '0_manager'];
+    const boardsPackagesGroup = [...boardsSubmenuPath, '1_packages'];
+
+    this.menuModelRegistry.registerMenuAction(boardsManagerGroup, {
+      commandId: `${BoardsListWidget.WIDGET_ID}:toggle`,
+      label: `${BoardsListWidget.WIDGET_LABEL}...`,
+    });
+
+    // Installed boards
+    installedBoards.forEach((board, index) => {
+      const { packageId, packageName, fqbn, name, manuallyInstalled } = board;
+
+      const packageLabel =
+        packageName +
+        `${
+          manuallyInstalled
+            ? nls.localize('arduino/board/inSketchbook', ' (in Sketchbook)')
+            : ''
+        }`;
+      // Platform submenu
+      const platformMenuPath = [...boardsPackagesGroup, packageId];
+      // Note: Registering the same submenu twice is a noop. No need to group the boards per platform.
+      this.menuModelRegistry.registerSubmenu(platformMenuPath, packageLabel, {
+        order: packageName.toLowerCase(),
+      });
+
+      const id = `arduino-select-board--${fqbn}`;
+      const command = { id };
+      const handler = {
+        execute: () => {
+          if (
+            fqbn !== this.boardsServiceProvider.boardsConfig.selectedBoard?.fqbn
+          ) {
+            this.boardsServiceProvider.boardsConfig = {
+              selectedBoard: {
+                name,
+                fqbn,
+                port: this.boardsServiceProvider.boardsConfig.selectedBoard
+                  ?.port, // TODO: verify!
+              },
+              selectedPort:
+                this.boardsServiceProvider.boardsConfig.selectedPort,
+            };
+          }
+        },
+        isToggled: () =>
+          fqbn === this.boardsServiceProvider.boardsConfig.selectedBoard?.fqbn,
+      };
+
+      // Board menu
+      const menuAction = {
+        commandId: id,
+        label: name,
+        order: String(index).padStart(4), // pads with leading zeros for alphanumeric sort where order is 1, 2, 11, and NOT 1, 11, 2
+      };
+      this.commandRegistry.registerCommand(command, handler);
+      this.toDisposeBeforeMenuRebuild.push(
+        Disposable.create(() => this.commandRegistry.unregisterCommand(command))
+      );
+      this.menuModelRegistry.registerMenuAction(platformMenuPath, menuAction);
+      // Note: we do not dispose the menu actions individually. Calling `unregisterSubmenu` on the parent will wipe the children menu nodes recursively.
+    });
+
+    // Installed ports
+    const registerPorts = (
+      protocol: string,
+      protocolOrder: number,
+      ports: AvailablePorts
+    ) => {
+      const portIDs = Object.keys(ports);
+      if (!portIDs.length) {
+        return;
+      }
+
+      // Register placeholder for protocol
+      const menuPath = [
+        ...portsSubmenuPath,
+        `${protocolOrder.toString()}_${protocol}`,
+      ];
+      const placeholder = new PlaceholderMenuNode(
+        menuPath,
+        nls.localize(
+          'arduino/board/typeOfPorts',
+          '{0} ports',
+          Port.Protocols.protocolLabel(protocol)
+        ),
+        { order: protocolOrder.toString().padStart(4) }
+      );
+      this.menuModelRegistry.registerMenuNode(menuPath, placeholder);
+      this.toDisposeBeforeMenuRebuild.push(
+        Disposable.create(() =>
+          this.menuModelRegistry.unregisterMenuNode(placeholder.id)
+        )
+      );
+
+      // First we show addresses with recognized boards connected,
+      // then all the rest.
+      const sortedIDs = Object.keys(ports).sort(
+        (left: string, right: string): number => {
+          const [, leftBoards] = ports[left];
+          const [, rightBoards] = ports[right];
+          return rightBoards.length - leftBoards.length;
+        }
+      );
+
+      for (let i = 0; i < sortedIDs.length; i++) {
+        const portID = sortedIDs[i];
+        const [port, boards] = ports[portID];
+        let label = `${port.addressLabel}`;
+        if (boards.length) {
+          const boardsList = boards.map((board) => board.name).join(', ');
+          label = `${label} (${boardsList})`;
+        }
+        const id = `arduino-select-port--${portID}`;
+        const command = { id };
+        const handler = {
+          execute: () => {
+            if (
+              !Port.sameAs(
+                port,
+                this.boardsServiceProvider.boardsConfig.selectedPort
+              )
+            ) {
+              this.boardsServiceProvider.boardsConfig = {
+                selectedBoard:
+                  this.boardsServiceProvider.boardsConfig.selectedBoard,
+                selectedPort: port,
+              };
+            }
+          },
+          isToggled: () =>
+            Port.sameAs(
+              port,
+              this.boardsServiceProvider.boardsConfig.selectedPort
+            ),
+        };
+        const menuAction = {
+          commandId: id,
+          label,
+          order: String(protocolOrder + i + 1).padStart(4),
+        };
+        this.commandRegistry.registerCommand(command, handler);
+        this.toDisposeBeforeMenuRebuild.push(
+          Disposable.create(() =>
+            this.commandRegistry.unregisterCommand(command)
+          )
+        );
+        this.menuModelRegistry.registerMenuAction(menuPath, menuAction);
+      }
+    };
+
+    const grouped = AvailablePorts.groupByProtocol(availablePorts);
+    let protocolOrder = 100;
+    // We first show serial and network ports, then all the rest
+    ['serial', 'network'].forEach((protocol) => {
+      const ports = grouped.get(protocol);
+      if (ports) {
+        registerPorts(protocol, protocolOrder, ports);
+        grouped.delete(protocol);
+        protocolOrder = protocolOrder + 100;
+      }
+    });
+    grouped.forEach((ports, protocol) => {
+      registerPorts(protocol, protocolOrder, ports);
+      protocolOrder = protocolOrder + 100;
+    });
+
+    this.mainMenuManager.update();
+  }
+
+  protected async installedBoards(): Promise<InstalledBoardWithPackage[]> {
+    const allBoards = await this.boardsService.getInstalledBoards();
+    return allBoards.filter(InstalledBoardWithPackage.is);
+  }
+}
+export namespace BoardSelection {
+  export namespace Commands {
+    export const GET_BOARD_INFO: Command = { id: 'arduino-get-board-info' };
+  }
+}

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

@@ -1,94 +1,88 @@
-import { inject, injectable } from 'inversify';
-import { OutputChannelManager } from '@theia/output/lib/common/output-channel';
+import { nls } from '@theia/core/lib/common';
+import { injectable } from '@theia/core/shared/inversify';
 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 { BoardsServiceClientImpl } from '../boards/boards-service-client-impl';
-import { SketchContribution, Command, CommandRegistry, MenuModelRegistry } from './contribution';
+import {
+  Command,
+  CommandRegistry,
+  CoreServiceContribution,
+  MenuModelRegistry,
+} from './contribution';
 
 @injectable()
-export class BurnBootloader extends SketchContribution {
+export class BurnBootloader extends CoreServiceContribution {
+  override registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(BurnBootloader.Commands.BURN_BOOTLOADER, {
+      execute: () => this.burnBootloader(),
+    });
+  }
 
-    @inject(CoreService)
-    protected readonly coreService: CoreService;
+  override registerMenus(registry: MenuModelRegistry): void {
+    registry.registerMenuAction(ArduinoMenus.TOOLS__BOARD_SETTINGS_GROUP, {
+      commandId: BurnBootloader.Commands.BURN_BOOTLOADER.id,
+      label: nls.localize(
+        'arduino/bootloader/burnBootloader',
+        'Burn Bootloader'
+      ),
+      order: 'z99',
+    });
+  }
 
-    @inject(MonitorConnection)
-    protected readonly monitorConnection: MonitorConnection;
-
-    @inject(BoardsDataStore)
-    protected readonly boardsDataStore: BoardsDataStore;
-
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClientImpl: BoardsServiceClientImpl;
-
-    @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;
-            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 { selectedPort } = boardsConfig;
-            if (!selectedPort) {
-                throw new Error('No ports selected. Please select a port.');
-            }
-
-            const port = selectedPort.address;
-            const [fqbn, { selectedProgrammer: programmer }] = await Promise.all([
-                this.boardsDataStore.appendConfigToFqbn(boardsConfig.selectedBoard.fqbn),
-                this.boardsDataStore.getData(boardsConfig.selectedBoard.fqbn)
-            ]);
-
-            if (!programmer) {
-                throw new Error('Programmer is not selected. Please select a programmer from the `Tools` > `Programmer` menu.');
-            }
-
-            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);
-            }
+  private async burnBootloader(): Promise<void> {
+    this.clearVisibleNotification();
+    const options = await this.options();
+    try {
+      await this.doWithProgress({
+        progressText: nls.localize(
+          'arduino/bootloader/burningBootloader',
+          'Burning bootloader...'
+        ),
+        task: (progressId, coreService) =>
+          coreService.burnBootloader({
+            ...options,
+            progressId,
+          }),
+      });
+      this.messageService.info(
+        nls.localize(
+          'arduino/bootloader/doneBurningBootloader',
+          'Done burning bootloader.'
+        ),
+        {
+          timeout: 3000,
         }
+      );
+    } catch (e) {
+      this.handleError(e);
     }
+  }
 
+  private async options(): Promise<CoreService.Options.Bootloader> {
+    const { boardsConfig } = this.boardsServiceProvider;
+    const port = boardsConfig.selectedPort;
+    const [fqbn, { selectedProgrammer: programmer }, verify, verbose] =
+      await Promise.all([
+        this.boardsDataStore.appendConfigToFqbn(
+          boardsConfig.selectedBoard?.fqbn
+        ),
+        this.boardsDataStore.getData(boardsConfig.selectedBoard?.fqbn),
+        this.preferences.get('arduino.upload.verify'),
+        this.preferences.get('arduino.upload.verbose'),
+      ]);
+    return {
+      fqbn,
+      programmer,
+      port,
+      verify,
+      verbose,
+    };
+  }
 }
 
 export namespace BurnBootloader {
-    export namespace Commands {
-        export const BURN_BOOTLOADER: Command = {
-            id: 'arduino-burn-bootloader'
-        };
-    }
+  export namespace Commands {
+    export const BURN_BOOTLOADER: Command = {
+      id: 'arduino-burn-bootloader',
+    };
+  }
 }

arduino-ide-extension/src/browser/contributions/check-for-ide-updates.ts

@@ -0,0 +1,69 @@
+import { nls } from '@theia/core/lib/common/nls';
+import { LocalStorageService } from '@theia/core/lib/browser/storage-service';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import {
+  IDEUpdater,
+  SKIP_IDE_VERSION,
+} from '../../common/protocol/ide-updater';
+import { IDEUpdaterDialog } from '../dialogs/ide-updater/ide-updater-dialog';
+import { Contribution } from './contribution';
+
+@injectable()
+export class CheckForIDEUpdates extends Contribution {
+  @inject(IDEUpdater)
+  private readonly updater: IDEUpdater;
+
+  @inject(IDEUpdaterDialog)
+  private readonly updaterDialog: IDEUpdaterDialog;
+
+  @inject(LocalStorageService)
+  private readonly localStorage: LocalStorageService;
+
+  override onStart(): void {
+    this.preferences.onPreferenceChanged(
+      ({ preferenceName, newValue, oldValue }) => {
+        if (newValue !== oldValue) {
+          switch (preferenceName) {
+            case 'arduino.ide.updateChannel':
+            case 'arduino.ide.updateBaseUrl':
+              this.updater.init(
+                this.preferences.get('arduino.ide.updateChannel'),
+                this.preferences.get('arduino.ide.updateBaseUrl')
+              );
+          }
+        }
+      }
+    );
+  }
+
+  override onReady(): void {
+    this.updater
+      .init(
+        this.preferences.get('arduino.ide.updateChannel'),
+        this.preferences.get('arduino.ide.updateBaseUrl')
+      )
+      .then(() => {
+        if (!this.preferences['arduino.checkForUpdates']) {
+          return;
+        }
+        return this.updater.checkForUpdates(true);
+      })
+      .then(async (updateInfo) => {
+        if (!updateInfo) return;
+        const versionToSkip = await this.localStorage.getData<string>(
+          SKIP_IDE_VERSION
+        );
+        if (versionToSkip === updateInfo.version) return;
+        this.updaterDialog.open(updateInfo);
+      })
+      .catch((e) => {
+        this.messageService.error(
+          nls.localize(
+            'arduino/ide-updater/errorCheckingForUpdates',
+            'Error while checking for Arduino IDE updates.\n{0}',
+            e.message
+          )
+        );
+      });
+  }
+}

arduino-ide-extension/src/browser/contributions/check-for-updates.ts

@@ -0,0 +1,221 @@
+import type { AbstractViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
+import { nls } from '@theia/core/lib/common/nls';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { InstallManually, Later } from '../../common/nls';
+import {
+  ArduinoComponent,
+  BoardsPackage,
+  BoardsService,
+  LibraryPackage,
+  LibraryService,
+  ResponseServiceClient,
+  Searchable,
+} from '../../common/protocol';
+import { Installable } from '../../common/protocol/installable';
+import { ExecuteWithProgress } from '../../common/protocol/progressible';
+import { BoardsListWidgetFrontendContribution } from '../boards/boards-widget-frontend-contribution';
+import { LibraryListWidgetFrontendContribution } from '../library/library-widget-frontend-contribution';
+import { WindowServiceExt } from '../theia/core/window-service-ext';
+import type { ListWidget } from '../widgets/component-list/list-widget';
+import { Command, CommandRegistry, Contribution } from './contribution';
+
+const NoUpdates = nls.localize(
+  'arduino/checkForUpdates/noUpdates',
+  'There are no recent updates available.'
+);
+const PromptUpdateBoards = nls.localize(
+  'arduino/checkForUpdates/promptUpdateBoards',
+  'Updates are available for some of your boards.'
+);
+const PromptUpdateLibraries = nls.localize(
+  'arduino/checkForUpdates/promptUpdateLibraries',
+  'Updates are available for some of your libraries.'
+);
+const UpdatingBoards = nls.localize(
+  'arduino/checkForUpdates/updatingBoards',
+  'Updating boards...'
+);
+const UpdatingLibraries = nls.localize(
+  'arduino/checkForUpdates/updatingLibraries',
+  'Updating libraries...'
+);
+const InstallAll = nls.localize(
+  'arduino/checkForUpdates/installAll',
+  'Install All'
+);
+
+interface Task<T extends ArduinoComponent> {
+  readonly run: () => Promise<void>;
+  readonly item: T;
+}
+
+const Updatable = { type: 'Updatable' } as const;
+
+@injectable()
+export class CheckForUpdates extends Contribution {
+  @inject(WindowServiceExt)
+  private readonly windowService: WindowServiceExt;
+  @inject(ResponseServiceClient)
+  private readonly responseService: ResponseServiceClient;
+  @inject(BoardsService)
+  private readonly boardsService: BoardsService;
+  @inject(LibraryService)
+  private readonly libraryService: LibraryService;
+  @inject(BoardsListWidgetFrontendContribution)
+  private readonly boardsContribution: BoardsListWidgetFrontendContribution;
+  @inject(LibraryListWidgetFrontendContribution)
+  private readonly librariesContribution: LibraryListWidgetFrontendContribution;
+
+  override registerCommands(register: CommandRegistry): void {
+    register.registerCommand(CheckForUpdates.Commands.CHECK_FOR_UPDATES, {
+      execute: () => this.checkForUpdates(false),
+    });
+  }
+
+  override async onReady(): Promise<void> {
+    const checkForUpdates = this.preferences['arduino.checkForUpdates'];
+    if (checkForUpdates) {
+      this.windowService.isFirstWindow().then((firstWindow) => {
+        if (firstWindow) {
+          this.checkForUpdates();
+        }
+      });
+    }
+  }
+
+  private async checkForUpdates(silent = true) {
+    const [boardsPackages, libraryPackages] = await Promise.all([
+      this.boardsService.search(Updatable),
+      this.libraryService.search(Updatable),
+    ]);
+    this.promptUpdateBoards(boardsPackages);
+    this.promptUpdateLibraries(libraryPackages);
+    if (!libraryPackages.length && !boardsPackages.length && !silent) {
+      this.messageService.info(NoUpdates);
+    }
+  }
+
+  private promptUpdateBoards(items: BoardsPackage[]): void {
+    this.prompt({
+      items,
+      installable: this.boardsService,
+      viewContribution: this.boardsContribution,
+      viewSearchOptions: { query: '', ...Updatable },
+      promptMessage: PromptUpdateBoards,
+      updatingMessage: UpdatingBoards,
+    });
+  }
+
+  private promptUpdateLibraries(items: LibraryPackage[]): void {
+    this.prompt({
+      items,
+      installable: this.libraryService,
+      viewContribution: this.librariesContribution,
+      viewSearchOptions: { query: '', topic: 'All', ...Updatable },
+      promptMessage: PromptUpdateLibraries,
+      updatingMessage: UpdatingLibraries,
+    });
+  }
+
+  private prompt<
+    T extends ArduinoComponent,
+    S extends Searchable.Options
+  >(options: {
+    items: T[];
+    installable: Installable<T>;
+    viewContribution: AbstractViewContribution<ListWidget<T, S>>;
+    viewSearchOptions: S;
+    promptMessage: string;
+    updatingMessage: string;
+  }): void {
+    const {
+      items,
+      installable,
+      viewContribution,
+      promptMessage: message,
+      viewSearchOptions,
+      updatingMessage,
+    } = options;
+
+    if (!items.length) {
+      return;
+    }
+    this.messageService
+      .info(message, Later, InstallManually, InstallAll)
+      .then((answer) => {
+        if (answer === InstallAll) {
+          const tasks = items.map((item) =>
+            this.createInstallTask(item, installable)
+          );
+          this.executeTasks(updatingMessage, tasks);
+        } else if (answer === InstallManually) {
+          viewContribution
+            .openView({ reveal: true })
+            .then((widget) => widget.refresh(viewSearchOptions));
+        }
+      });
+  }
+
+  private async executeTasks(
+    message: string,
+    tasks: Task<ArduinoComponent>[]
+  ): Promise<void> {
+    if (tasks.length) {
+      return ExecuteWithProgress.withProgress(
+        message,
+        this.messageService,
+        async (progress) => {
+          try {
+            const total = tasks.length;
+            let count = 0;
+            for (const { run, item } of tasks) {
+              try {
+                await run(); // runs update sequentially. // TODO: is parallel update desired?
+              } catch (err) {
+                console.error(err);
+                this.messageService.error(
+                  `Failed to update ${item.name}. ${err}`
+                );
+              } finally {
+                progress.report({ work: { total, done: ++count } });
+              }
+            }
+          } finally {
+            progress.cancel();
+          }
+        }
+      );
+    }
+  }
+
+  private createInstallTask<T extends ArduinoComponent>(
+    item: T,
+    installable: Installable<T>
+  ): Task<T> {
+    const latestVersion = item.availableVersions[0];
+    return {
+      item,
+      run: () =>
+        Installable.installWithProgress({
+          installable,
+          item,
+          version: latestVersion,
+          messageService: this.messageService,
+          responseService: this.responseService,
+          keepOutput: true,
+        }),
+    };
+  }
+}
+export namespace CheckForUpdates {
+  export namespace Commands {
+    export const CHECK_FOR_UPDATES: Command = Command.toLocalizedCommand(
+      {
+        id: 'arduino-check-for-updates',
+        label: 'Check for Arduino Updates',
+        category: 'Arduino',
+      },
+      'arduino/checkForUpdates/checkForUpdates'
+    );
+  }
+}

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

@@ -1,89 +0,0 @@
-import { inject, injectable } from 'inversify';
-import { remote } from 'electron';
-import { ArduinoMenus } from '../menu/arduino-menus';
-import { SketchContribution, Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, URI } from './contribution';
-import { SaveAsSketch } from './save-as-sketch';
-import { EditorManager } from '@theia/editor/lib/browser';
-import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
-
-@injectable()
-export class CloseSketch extends SketchContribution {
-
-    @inject(EditorManager)
-    protected readonly editorManager: EditorManager;
-
-    registerCommands(registry: CommandRegistry): void {
-        registry.registerCommand(CloseSketch.Commands.CLOSE_SKETCH, {
-            execute: async () => {
-                const sketch = await this.sketchServiceClient.currentSketch();
-                if (!sketch) {
-                    return;
-                }
-                const isTemp = await this.sketchService.isTemp(sketch);
-                const uri = await this.sketchServiceClient.currentSketchFile();
-                if (!uri) {
-                    return;
-                }
-                if (isTemp && await this.wasTouched(uri)) {
-                    const { response } = await remote.dialog.showMessageBox({
-                        type: 'question',
-                        buttons: ["Don't Save", 'Cancel', 'Save'],
-                        message: 'Do you want to save changes to this sketch before closing?',
-                        detail: "If you don't save, your changes will be lost."
-                    });
-                    if (response === 1) { // Cancel
-                        return;
-                    }
-                    if (response === 2) { // Save
-                        const saved = await this.commandService.executeCommand(SaveAsSketch.Commands.SAVE_AS_SKETCH.id, { openAfterMove: false, execOnlyIfTemp: true });
-                        if (!saved) { // If it was not saved, do bail the close.
-                            return;
-                        }
-                    }
-                }
-                window.close();
-            }
-        });
-    }
-
-    registerMenus(registry: MenuModelRegistry): void {
-        registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
-            commandId: CloseSketch.Commands.CLOSE_SKETCH.id,
-            label: 'Close',
-            order: '5'
-        });
-    }
-
-    registerKeybindings(registry: KeybindingRegistry): void {
-        registry.registerKeybinding({
-            command: CloseSketch.Commands.CLOSE_SKETCH.id,
-            keybinding: 'CtrlCmd+W'
-        });
-    }
-
-    /**
-     * If the file was ever touched/modified. We get this based on the `version` of the monaco model.
-     */
-    protected async wasTouched(uri: string): Promise<boolean> {
-        const editorWidget = await this.editorManager.getByUri(new URI(uri));
-        if (editorWidget) {
-            const { editor } = editorWidget;
-            if (editor instanceof MonacoEditor) {
-                const versionId = editor.getControl().getModel()?.getVersionId();
-                if (Number.isInteger(versionId) && versionId! > 1) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-}
-
-export namespace CloseSketch {
-    export namespace Commands {
-        export const CLOSE_SKETCH: Command = {
-            id: 'arduino-close-sketch'
-        };
-    }
-}

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

@@ -0,0 +1,230 @@
+import { injectable } from '@theia/core/shared/inversify';
+import { toArray } from '@theia/core/shared/@phosphor/algorithm';
+import * as remote from '@theia/core/electron-shared/@electron/remote';
+import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
+import type { MaybePromise } from '@theia/core/lib/common/types';
+import type {
+  FrontendApplication,
+  OnWillStopAction,
+} from '@theia/core/lib/browser/frontend-application';
+import { nls } from '@theia/core/lib/common/nls';
+import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import {
+  SketchContribution,
+  Command,
+  CommandRegistry,
+  MenuModelRegistry,
+  KeybindingRegistry,
+  Sketch,
+  URI,
+} from './contribution';
+import { Dialog } from '@theia/core/lib/browser/dialogs';
+import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
+import { SaveAsSketch } from './save-as-sketch';
+
+/**
+ * Closes the `current` closeable editor, or any closeable current widget from the main area, or the current sketch window.
+ */
+@injectable()
+export class Close extends SketchContribution {
+  private shell: ApplicationShell | undefined;
+
+  override onStart(app: FrontendApplication): MaybePromise<void> {
+    this.shell = app.shell;
+  }
+
+  override registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(Close.Commands.CLOSE, {
+      execute: () => {
+        // Close current editor if closeable.
+        const { currentEditor } = this.editorManager;
+        if (currentEditor && currentEditor.title.closable) {
+          currentEditor.close();
+          return;
+        }
+
+        if (this.shell) {
+          // Close current widget from the main area if possible.
+          const { currentWidget } = this.shell;
+          if (currentWidget) {
+            const currentWidgetInMain = toArray(
+              this.shell.mainPanel.widgets()
+            ).find((widget) => widget === currentWidget);
+            if (currentWidgetInMain && currentWidgetInMain.title.closable) {
+              return currentWidgetInMain.close();
+            }
+          }
+        }
+        return remote.getCurrentWindow().close();
+      },
+    });
+  }
+
+  override registerMenus(registry: MenuModelRegistry): void {
+    registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
+      commandId: Close.Commands.CLOSE.id,
+      label: nls.localize('vscode/editor.contribution/close', 'Close'),
+      order: '6',
+    });
+  }
+
+  override registerKeybindings(registry: KeybindingRegistry): void {
+    registry.registerKeybinding({
+      command: Close.Commands.CLOSE.id,
+      keybinding: 'CtrlCmd+W',
+    });
+  }
+
+  // `FrontendApplicationContribution#onWillStop`
+  onWillStop(): OnWillStopAction {
+    return {
+      reason: 'save-sketch',
+      action: () => {
+        return this.showSaveSketchDialog();
+      },
+    };
+  }
+
+  /**
+   * If returns with `true`, IDE2 will close. Otherwise, it won't.
+   */
+  private async showSaveSketchDialog(): Promise<boolean> {
+    const sketch = await this.isCurrentSketchTemp();
+    if (!sketch) {
+      // Normal close workflow: if there are dirty editors prompt the user.
+      if (!this.shell) {
+        console.error(
+          `Could not get the application shell. Something went wrong.`
+        );
+        return true;
+      }
+      if (this.shell.canSaveAll()) {
+        const prompt = await this.prompt(false);
+        switch (prompt) {
+          case Prompt.DoNotSave:
+            return true;
+          case Prompt.Cancel:
+            return false;
+          case Prompt.Save: {
+            await this.shell.saveAll();
+            return true;
+          }
+          default:
+            throw new Error(`Unexpected prompt: ${prompt}`);
+        }
+      }
+      return true;
+    }
+
+    // If non of the sketch files were ever touched, do not prompt the save dialog. (#1274)
+    const wereTouched = await Promise.all(
+      Sketch.uris(sketch).map((uri) => this.wasTouched(uri))
+    );
+    if (wereTouched.every((wasTouched) => !Boolean(wasTouched))) {
+      return true;
+    }
+
+    const prompt = await this.prompt(true);
+    switch (prompt) {
+      case Prompt.DoNotSave:
+        return true;
+      case Prompt.Cancel:
+        return false;
+      case Prompt.Save: {
+        // If `save as` was canceled by user, the result will be `undefined`, otherwise the new URI.
+        const result = await this.commandService.executeCommand(
+          SaveAsSketch.Commands.SAVE_AS_SKETCH.id,
+          {
+            execOnlyIfTemp: false,
+            openAfterMove: false,
+            wipeOriginal: true,
+            markAsRecentlyOpened: true,
+          }
+        );
+        return !!result;
+      }
+      default:
+        throw new Error(`Unexpected prompt: ${prompt}`);
+    }
+  }
+
+  private async prompt(isTemp: boolean): Promise<Prompt> {
+    const { response } = await remote.dialog.showMessageBox(
+      remote.getCurrentWindow(),
+      {
+        message: nls.localize(
+          'arduino/sketch/saveSketch',
+          'Save your sketch to open it again later.'
+        ),
+        title: nls.localize(
+          'theia/core/quitTitle',
+          'Are you sure you want to quit?'
+        ),
+        type: 'question',
+        buttons: [
+          nls.localizeByDefault("Don't Save"),
+          Dialog.CANCEL,
+          nls.localizeByDefault(isTemp ? 'Save As...' : 'Save'),
+        ],
+        defaultId: 2, // `Save`/`Save As...` button index is the default.
+      }
+    );
+    switch (response) {
+      case 0:
+        return Prompt.DoNotSave;
+      case 1:
+        return Prompt.Cancel;
+      case 2:
+        return Prompt.Save;
+      default:
+        throw new Error(`Unexpected response: ${response}`);
+    }
+  }
+
+  private async isCurrentSketchTemp(): Promise<false | Sketch> {
+    const currentSketch = await this.sketchServiceClient.currentSketch();
+    if (CurrentSketch.isValid(currentSketch)) {
+      const isTemp = await this.sketchService.isTemp(currentSketch);
+      if (isTemp) {
+        return currentSketch;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * If the file was ever touched/modified. We get this based on the `version` of the monaco model.
+   */
+  protected async wasTouched(uri: string): Promise<boolean> {
+    const editorWidget = await this.editorManager.getByUri(new URI(uri));
+    if (editorWidget) {
+      const { editor } = editorWidget;
+      if (editor instanceof MonacoEditor) {
+        const versionId = editor.getControl().getModel()?.getVersionId();
+        if (this.isInteger(versionId) && versionId > 1) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
+  private isInteger(arg: unknown): arg is number {
+    return Number.isInteger(arg);
+  }
+}
+
+enum Prompt {
+  Save,
+  DoNotSave,
+  Cancel,
+}
+
+export namespace Close {
+  export namespace Commands {
+    export const CLOSE: Command = {
+      id: 'arduino-close',
+    };
+  }
+}

arduino-ide-extension/src/browser/contributions/compiler-errors.ts

@@ -0,0 +1,804 @@
+import {
+  Command,
+  CommandRegistry,
+  Disposable,
+  DisposableCollection,
+  Emitter,
+  MaybeArray,
+  MaybePromise,
+  nls,
+  notEmpty,
+} from '@theia/core';
+import { ApplicationShell, FrontendApplication } from '@theia/core/lib/browser';
+import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
+import URI from '@theia/core/lib/common/uri';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import {
+  Location,
+  Range,
+} from '@theia/core/shared/vscode-languageserver-protocol';
+import {
+  EditorWidget,
+  TextDocumentChangeEvent,
+} from '@theia/editor/lib/browser';
+import {
+  EditorDecoration,
+  TrackedRangeStickiness,
+} from '@theia/editor/lib/browser/decorations/editor-decoration';
+import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
+import * as monaco from '@theia/monaco-editor-core';
+import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
+import { MonacoToProtocolConverter } from '@theia/monaco/lib/browser/monaco-to-protocol-converter';
+import { ProtocolToMonacoConverter } from '@theia/monaco/lib/browser/protocol-to-monaco-converter';
+import { OutputUri } from '@theia/output/lib/common/output-uri';
+import { CoreError } from '../../common/protocol/core-service';
+import { ErrorRevealStrategy } from '../arduino-preferences';
+import { ArduinoOutputSelector, InoSelector } from '../selectors';
+import { Contribution } from './contribution';
+import { CoreErrorHandler } from './core-error-handler';
+import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
+
+interface ErrorDecorationRef {
+  /**
+   * This is the unique ID of the decoration given by `monaco`.
+   */
+  readonly id: string;
+  /**
+   * The resource this decoration belongs to.
+   */
+  readonly uri: string;
+}
+export namespace ErrorDecorationRef {
+  export function is(arg: unknown): arg is ErrorDecorationRef {
+    if (typeof arg === 'object') {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const object = arg as any;
+      return (
+        'uri' in object &&
+        typeof object['uri'] === 'string' &&
+        'id' in object &&
+        typeof object['id'] === 'string'
+      );
+    }
+    return false;
+  }
+  export function sameAs(
+    left: ErrorDecorationRef,
+    right: ErrorDecorationRef
+  ): boolean {
+    return left.id === right.id && left.uri === right.uri;
+  }
+}
+
+interface ErrorDecoration extends ErrorDecorationRef {
+  /**
+   * The range of the error location the error in the compiler output from the CLI.
+   */
+  readonly rangesInOutput: monaco.Range[];
+}
+namespace ErrorDecoration {
+  export function rangeOf(
+    editorOrModel: MonacoEditor | ITextModel | undefined,
+    decorations: ErrorDecoration
+  ): monaco.Range | undefined;
+  export function rangeOf(
+    editorOrModel: MonacoEditor | ITextModel | undefined,
+    decorations: ErrorDecoration[]
+  ): (monaco.Range | undefined)[];
+  export function rangeOf(
+    editorOrModel: MonacoEditor | ITextModel | undefined,
+    decorations: ErrorDecoration | ErrorDecoration[]
+  ): MaybePromise<MaybeArray<monaco.Range | undefined>> {
+    if (editorOrModel) {
+      const allDecorations = getAllDecorations(editorOrModel);
+      if (allDecorations) {
+        if (Array.isArray(decorations)) {
+          return decorations.map(({ id: decorationId }) =>
+            findRangeOf(decorationId, allDecorations)
+          );
+        } else {
+          return findRangeOf(decorations.id, allDecorations);
+        }
+      }
+    }
+    return Array.isArray(decorations)
+      ? decorations.map(() => undefined)
+      : undefined;
+  }
+  function findRangeOf(
+    decorationId: string,
+    allDecorations: { id: string; range?: monaco.Range }[]
+  ): monaco.Range | undefined {
+    return allDecorations.find(
+      ({ id: candidateId }) => candidateId === decorationId
+    )?.range;
+  }
+  function getAllDecorations(
+    editorOrModel: MonacoEditor | ITextModel
+  ): { id: string; range?: monaco.Range }[] {
+    if (editorOrModel instanceof MonacoEditor) {
+      const model = editorOrModel.getControl().getModel();
+      if (!model) {
+        return [];
+      }
+      return model.getAllDecorations();
+    }
+    return editorOrModel.getAllDecorations();
+  }
+}
+
+@injectable()
+export class CompilerErrors
+  extends Contribution
+  implements monaco.languages.CodeLensProvider, monaco.languages.LinkProvider
+{
+  @inject(EditorManager)
+  private readonly editorManager: EditorManager;
+
+  @inject(ProtocolToMonacoConverter)
+  private readonly p2m: ProtocolToMonacoConverter;
+
+  @inject(MonacoToProtocolConverter)
+  private readonly m2p: MonacoToProtocolConverter;
+
+  @inject(CoreErrorHandler)
+  private readonly coreErrorHandler: CoreErrorHandler;
+
+  private revealStrategy = ErrorRevealStrategy.Default;
+  private experimental = false;
+
+  private readonly errors: ErrorDecoration[] = [];
+  private readonly onDidChangeEmitter = new monaco.Emitter<this>();
+  private readonly currentErrorDidChangEmitter = new Emitter<ErrorDecoration>();
+  private readonly onCurrentErrorDidChange =
+    this.currentErrorDidChangEmitter.event;
+  private readonly toDisposeOnCompilerErrorDidChange =
+    new DisposableCollection();
+
+  private shell: ApplicationShell | undefined;
+  private currentError: ErrorDecoration | undefined;
+  private get currentErrorIndex(): number {
+    const current = this.currentError;
+    if (!current) {
+      return -1;
+    }
+    return this.errors.findIndex((error) =>
+      ErrorDecorationRef.sameAs(error, current)
+    );
+  }
+
+  override onStart(app: FrontendApplication): void {
+    this.shell = app.shell;
+    monaco.languages.registerCodeLensProvider(InoSelector, this);
+    monaco.languages.registerLinkProvider(ArduinoOutputSelector, this);
+    this.coreErrorHandler.onCompilerErrorsDidChange((errors) =>
+      this.handleCompilerErrorsDidChange(errors)
+    );
+    this.onCurrentErrorDidChange(async (error) => {
+      const monacoEditor = await this.monacoEditor(error.uri);
+      const monacoRange = ErrorDecoration.rangeOf(monacoEditor, error);
+      if (!monacoRange) {
+        console.warn(
+          'compiler-errors',
+          `Could not find range of decoration: ${error.id}`
+        );
+        return;
+      }
+      const range = this.m2p.asRange(monacoRange);
+      const editor = await this.revealLocationInEditor({
+        uri: error.uri,
+        range,
+      });
+      if (!editor) {
+        console.warn(
+          'compiler-errors',
+          `Failed to mark error ${error.id} as the current one.`
+        );
+      } else {
+        const monacoEditor = this.monacoEditor(editor);
+        if (monacoEditor) {
+          monacoEditor.cursor = range.start;
+        }
+      }
+    });
+  }
+
+  override onReady(): MaybePromise<void> {
+    this.preferences.ready.then(() => {
+      this.experimental = Boolean(
+        this.preferences['arduino.compile.experimental']
+      );
+      const strategy = this.preferences['arduino.compile.revealRange'];
+      this.revealStrategy = ErrorRevealStrategy.is(strategy)
+        ? strategy
+        : ErrorRevealStrategy.Default;
+      this.preferences.onPreferenceChanged(
+        ({ preferenceName, newValue, oldValue }) => {
+          if (newValue === oldValue) {
+            return;
+          }
+          switch (preferenceName) {
+            case 'arduino.compile.revealRange': {
+              this.revealStrategy = ErrorRevealStrategy.is(newValue)
+                ? newValue
+                : ErrorRevealStrategy.Default;
+              return;
+            }
+            case 'arduino.compile.experimental': {
+              this.experimental = Boolean(newValue);
+              this.onDidChangeEmitter.fire(this);
+              return;
+            }
+          }
+        }
+      );
+    });
+  }
+
+  override registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(CompilerErrors.Commands.NEXT_ERROR, {
+      execute: () => {
+        const index = this.currentErrorIndex;
+        if (index < 0) {
+          console.warn(
+            'compiler-errors',
+            `Could not advance to next error. Unknown current error.`
+          );
+          return;
+        }
+        const nextError =
+          this.errors[index === this.errors.length - 1 ? 0 : index + 1];
+        return this.markAsCurrentError(nextError, {
+          forceReselect: true,
+          reveal: true,
+        });
+      },
+      isEnabled: () =>
+        this.experimental && !!this.currentError && this.errors.length > 1,
+    });
+    registry.registerCommand(CompilerErrors.Commands.PREVIOUS_ERROR, {
+      execute: () => {
+        const index = this.currentErrorIndex;
+        if (index < 0) {
+          console.warn(
+            'compiler-errors',
+            `Could not advance to previous error. Unknown current error.`
+          );
+          return;
+        }
+        const previousError =
+          this.errors[index === 0 ? this.errors.length - 1 : index - 1];
+        return this.markAsCurrentError(previousError, {
+          forceReselect: true,
+          reveal: true,
+        });
+      },
+      isEnabled: () =>
+        this.experimental && !!this.currentError && this.errors.length > 1,
+    });
+    registry.registerCommand(CompilerErrors.Commands.MARK_AS_CURRENT, {
+      execute: (arg: unknown) => {
+        if (ErrorDecorationRef.is(arg)) {
+          return this.markAsCurrentError(
+            { id: arg.id, uri: new URI(arg.uri).toString() }, // Make sure the URI fragments are encoded. On Windows, `C:` is encoded as `C%3A`.
+            { forceReselect: true, reveal: true }
+          );
+        }
+      },
+      isEnabled: () => !!this.errors.length,
+    });
+  }
+
+  get onDidChange(): monaco.IEvent<this> {
+    return this.onDidChangeEmitter.event;
+  }
+
+  async provideCodeLenses(
+    model: monaco.editor.ITextModel,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _token: monaco.CancellationToken
+  ): Promise<monaco.languages.CodeLensList> {
+    const lenses: monaco.languages.CodeLens[] = [];
+    if (
+      this.experimental &&
+      this.currentError &&
+      this.currentError.uri === model.uri.toString() &&
+      this.errors.length > 1
+    ) {
+      const monacoEditor = await this.monacoEditor(model.uri);
+      const range = ErrorDecoration.rangeOf(monacoEditor, this.currentError);
+      if (range) {
+        lenses.push(
+          {
+            range,
+            command: {
+              id: CompilerErrors.Commands.PREVIOUS_ERROR.id,
+              title: nls.localize(
+                'arduino/editor/previousError',
+                'Previous Error'
+              ),
+              arguments: [this.currentError],
+            },
+          },
+          {
+            range,
+            command: {
+              id: CompilerErrors.Commands.NEXT_ERROR.id,
+              title: nls.localize('arduino/editor/nextError', 'Next Error'),
+              arguments: [this.currentError],
+            },
+          }
+        );
+      }
+    }
+    return {
+      lenses,
+      dispose: () => {
+        /* NOOP */
+      },
+    };
+  }
+
+  async provideLinks(
+    model: monaco.editor.ITextModel,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _token: monaco.CancellationToken
+  ): Promise<monaco.languages.ILinksList> {
+    const links: monaco.languages.ILink[] = [];
+    if (
+      model.uri.scheme === OutputUri.SCHEME &&
+      model.uri.path === '/Arduino'
+    ) {
+      links.push(
+        ...this.errors
+          .filter((decoration) => !!decoration.rangesInOutput.length)
+          .map(({ rangesInOutput, id, uri }) =>
+            rangesInOutput.map(
+              (range) =>
+                <monaco.languages.ILink>{
+                  range,
+                  url: monaco.Uri.parse(`command://`).with({
+                    query: JSON.stringify({ id, uri }),
+                    path: CompilerErrors.Commands.MARK_AS_CURRENT.id,
+                  }),
+                  tooltip: nls.localize(
+                    'arduino/editor/revealError',
+                    'Reveal Error'
+                  ),
+                }
+            )
+          )
+          .reduce((acc, curr) => acc.concat(curr), [])
+      );
+    } else {
+      console.warn('unexpected URI: ' + model.uri.toString());
+    }
+    return { links };
+  }
+
+  async resolveLink(
+    link: monaco.languages.ILink,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _token: monaco.CancellationToken
+  ): Promise<monaco.languages.ILink | undefined> {
+    if (!this.experimental) {
+      return undefined;
+    }
+    const { url } = link;
+    if (url) {
+      const candidateUri = new URI(
+        typeof url === 'string' ? url : url.toString()
+      );
+      const candidateId = candidateUri.path.toString();
+      const error = this.errors.find((error) => error.id === candidateId);
+      if (error) {
+        const monacoEditor = await this.monacoEditor(error.uri);
+        const range = ErrorDecoration.rangeOf(monacoEditor, error);
+        if (range) {
+          return {
+            range,
+            url: monaco.Uri.parse(error.uri),
+          };
+        }
+      }
+    }
+    return undefined;
+  }
+
+  private async handleCompilerErrorsDidChange(
+    errors: CoreError.ErrorLocation[]
+  ): Promise<void> {
+    this.toDisposeOnCompilerErrorDidChange.dispose();
+    const groupedErrors = this.groupBy(
+      errors,
+      (error: CoreError.ErrorLocation) => error.location.uri
+    );
+    const decorations = await this.decorateEditors(groupedErrors);
+    this.errors.push(...decorations.errors);
+    this.toDisposeOnCompilerErrorDidChange.pushAll([
+      Disposable.create(() => (this.errors.length = 0)),
+      Disposable.create(() => this.onDidChangeEmitter.fire(this)),
+      ...(await Promise.all([
+        decorations.dispose,
+        this.trackEditors(
+          groupedErrors,
+          (editor) =>
+            editor.onSelectionChanged((selection) =>
+              this.handleSelectionChange(editor, selection)
+            ),
+          (editor) =>
+            editor.onDispose(() =>
+              this.handleEditorDidDispose(editor.uri.toString())
+            ),
+          (editor) =>
+            editor.onDocumentContentChanged((event) =>
+              this.handleDocumentContentChange(editor, event)
+            )
+        ),
+      ])),
+    ]);
+    const currentError = this.errors[0];
+    if (currentError) {
+      await this.markAsCurrentError(currentError, {
+        forceReselect: true,
+        reveal: true,
+      });
+    }
+  }
+
+  private async decorateEditors(
+    errors: Map<string, CoreError.ErrorLocation[]>
+  ): Promise<{ dispose: Disposable; errors: ErrorDecoration[] }> {
+    const composite = await Promise.all(
+      [...errors.entries()].map(([uri, errors]) =>
+        this.decorateEditor(uri, errors)
+      )
+    );
+    return {
+      dispose: new DisposableCollection(
+        ...composite.map(({ dispose }) => dispose)
+      ),
+      errors: composite.reduce(
+        (acc, { errors }) => acc.concat(errors),
+        [] as ErrorDecoration[]
+      ),
+    };
+  }
+
+  private async decorateEditor(
+    uri: string,
+    errors: CoreError.ErrorLocation[]
+  ): Promise<{ dispose: Disposable; errors: ErrorDecoration[] }> {
+    const editor = await this.monacoEditor(uri);
+    if (!editor) {
+      return { dispose: Disposable.NULL, errors: [] };
+    }
+    const oldDecorations = editor.deltaDecorations({
+      oldDecorations: [],
+      newDecorations: errors.map((error) =>
+        this.compilerErrorDecoration(error.location.range)
+      ),
+    });
+    return {
+      dispose: Disposable.create(() => {
+        if (editor) {
+          editor.deltaDecorations({
+            oldDecorations,
+            newDecorations: [],
+          });
+        }
+      }),
+      errors: oldDecorations.map((id, index) => ({
+        id,
+        uri,
+        rangesInOutput: errors[index].rangesInOutput.map((range) =>
+          this.p2m.asRange(range)
+        ),
+      })),
+    };
+  }
+
+  private compilerErrorDecoration(range: Range): EditorDecoration {
+    return {
+      range,
+      options: {
+        isWholeLine: true,
+        className: 'compiler-error',
+        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
+      },
+    };
+  }
+
+  /**
+   * Tracks the selection in all editors that have an error. If the editor selection overlaps one of the compiler error's range, mark as current error.
+   */
+  private handleSelectionChange(
+    monacoEditor: MonacoEditor,
+    selection: Range
+  ): void {
+    const uri = monacoEditor.uri.toString();
+    const monacoSelection = this.p2m.asRange(selection);
+    console.log(
+      'compiler-errors',
+      `Handling selection change in editor ${uri}. New (monaco) selection: ${monacoSelection.toJSON()}`
+    );
+    const calculatePriority = (
+      candidateErrorRange: monaco.Range,
+      currentSelection: monaco.Range
+    ) => {
+      console.trace(
+        'compiler-errors',
+        `Candidate error range: ${candidateErrorRange.toJSON()}`
+      );
+      console.trace(
+        'compiler-errors',
+        `Current selection range: ${currentSelection.toJSON()}`
+      );
+      if (candidateErrorRange.intersectRanges(currentSelection)) {
+        console.trace('Intersects.');
+        return { score: 2 };
+      }
+      if (
+        candidateErrorRange.startLineNumber <=
+          currentSelection.startLineNumber &&
+        candidateErrorRange.endLineNumber >= currentSelection.endLineNumber
+      ) {
+        console.trace('Same line.');
+        return { score: 1 };
+      }
+
+      console.trace('No match');
+      return undefined;
+    };
+    const errorsPerResource = this.errors.filter((error) => error.uri === uri);
+    const rangesPerResource = ErrorDecoration.rangeOf(
+      monacoEditor,
+      errorsPerResource
+    );
+    const error = rangesPerResource
+      .map((range, index) => ({ error: errorsPerResource[index], range }))
+      .map(({ error, range }) => {
+        if (range) {
+          const priority = calculatePriority(range, monacoSelection);
+          if (priority) {
+            return { ...priority, error };
+          }
+        }
+        return undefined;
+      })
+      .filter(notEmpty)
+      .sort((left, right) => right.score - left.score) // highest first
+      .map(({ error }) => error)
+      .shift();
+    if (error) {
+      this.markAsCurrentError(error);
+    } else {
+      console.info(
+        'compiler-errors',
+        `New (monaco) selection ${monacoSelection.toJSON()} does not intersect any error locations. Skipping.`
+      );
+    }
+  }
+
+  /**
+   * This code does not deal with resource deletion, but tracks editor dispose events. It does not matter what was the cause of the editor disposal.
+   * If editor closes, delete the decorators.
+   */
+  private handleEditorDidDispose(uri: string): void {
+    let i = this.errors.length;
+    // `splice` re-indexes the array. It's better to "iterate and modify" from the last element.
+    while (i--) {
+      const error = this.errors[i];
+      if (error.uri === uri) {
+        this.errors.splice(i, 1);
+      }
+    }
+    this.onDidChangeEmitter.fire(this);
+  }
+
+  /**
+   * If the text document changes in the line where compiler errors are, the compiler errors will be removed.
+   */
+  private handleDocumentContentChange(
+    monacoEditor: MonacoEditor,
+    event: TextDocumentChangeEvent
+  ): void {
+    const errorsPerResource = this.errors.filter(
+      (error) => error.uri === event.document.uri
+    );
+    let editorOrModel: MonacoEditor | ITextModel = monacoEditor;
+    const doc = event.document;
+    if (doc instanceof MonacoEditorModel) {
+      editorOrModel = doc.textEditorModel;
+    }
+    const rangesPerResource = ErrorDecoration.rangeOf(
+      editorOrModel,
+      errorsPerResource
+    );
+    const resolvedDecorations = rangesPerResource.map((range, index) => ({
+      error: errorsPerResource[index],
+      range,
+    }));
+    const decoratorsToRemove = event.contentChanges
+      .map(({ range }) => this.p2m.asRange(range))
+      .map((changedRange) =>
+        resolvedDecorations
+          .filter(({ range: decorationRange }) => {
+            if (!decorationRange) {
+              return false;
+            }
+            const affects =
+              changedRange.startLineNumber <= decorationRange.startLineNumber &&
+              changedRange.endLineNumber >= decorationRange.endLineNumber;
+            console.log(
+              'compiler-errors',
+              `decoration range: ${decorationRange.toString()}, change range: ${changedRange.toString()}, affects: ${affects}`
+            );
+            return affects;
+          })
+          .map(({ error }) => {
+            const index = this.errors.findIndex((candidate) =>
+              ErrorDecorationRef.sameAs(candidate, error)
+            );
+            return index !== -1 ? { error, index } : undefined;
+          })
+          .filter(notEmpty)
+      )
+      .reduce((acc, curr) => acc.concat(curr), [])
+      .sort((left, right) => left.index - right.index); // highest index last
+
+    if (decoratorsToRemove.length) {
+      let i = decoratorsToRemove.length;
+      while (i--) {
+        this.errors.splice(decoratorsToRemove[i].index, 1);
+      }
+      monacoEditor.getControl().deltaDecorations(
+        decoratorsToRemove.map(({ error }) => error.id),
+        []
+      );
+      this.onDidChangeEmitter.fire(this);
+    }
+  }
+
+  private async trackEditors(
+    errors: Map<string, CoreError.ErrorLocation[]>,
+    ...track: ((editor: MonacoEditor) => Disposable)[]
+  ): Promise<Disposable> {
+    return new DisposableCollection(
+      ...(await Promise.all(
+        Array.from(errors.keys()).map(async (uri) => {
+          const editor = await this.monacoEditor(uri);
+          if (!editor) {
+            return Disposable.NULL;
+          }
+          return new DisposableCollection(...track.map((t) => t(editor)));
+        })
+      ))
+    );
+  }
+
+  private async markAsCurrentError(
+    ref: ErrorDecorationRef,
+    options?: { forceReselect?: boolean; reveal?: boolean }
+  ): Promise<void> {
+    const index = this.errors.findIndex((candidate) =>
+      ErrorDecorationRef.sameAs(candidate, ref)
+    );
+    if (index < 0) {
+      console.warn(
+        'compiler-errors',
+        `Failed to mark error ${
+          ref.id
+        } as the current one. Error is unknown. Known errors are: ${this.errors.map(
+          ({ id }) => id
+        )}`
+      );
+      return;
+    }
+    const newError = this.errors[index];
+    if (
+      options?.forceReselect ||
+      !this.currentError ||
+      !ErrorDecorationRef.sameAs(this.currentError, newError)
+    ) {
+      this.currentError = this.errors[index];
+      console.log(
+        'compiler-errors',
+        `Current error changed to ${this.currentError.id}`
+      );
+      if (options?.reveal) {
+        this.currentErrorDidChangEmitter.fire(this.currentError);
+      }
+      this.onDidChangeEmitter.fire(this);
+    }
+  }
+
+  // The double editor activation logic is required: https://github.com/eclipse-theia/theia/issues/11284
+  private async revealLocationInEditor(
+    location: Location
+  ): Promise<EditorWidget | undefined> {
+    const { uri, range } = location;
+    const editor = await this.editorManager.getByUri(new URI(uri), {
+      mode: 'activate',
+    });
+    if (editor && this.shell) {
+      // to avoid flickering, reveal the range here and not with `getByUri`, because it uses `at: 'center'` for the reveal option.
+      // TODO: check the community reaction whether it is better to set the focus at the error marker. it might cause flickering even if errors are close to each other
+      editor.editor.revealRange(range, { at: this.revealStrategy });
+      const activeWidget = await this.shell.activateWidget(editor.id);
+      if (!activeWidget) {
+        console.warn(
+          'compiler-errors',
+          `editor widget activation has failed. editor widget ${editor.id} expected to be the active one.`
+        );
+        return editor;
+      }
+      if (editor !== activeWidget) {
+        console.warn(
+          'compiler-errors',
+          `active widget was not the same as previously activated editor. editor widget ID ${editor.id}, active widget ID: ${activeWidget.id}`
+        );
+      }
+      return editor;
+    }
+    console.warn(
+      'compiler-errors',
+      `could not find editor widget for URI: ${uri}`
+    );
+    return undefined;
+  }
+
+  private groupBy<K, V>(
+    elements: V[],
+    extractKey: (element: V) => K
+  ): Map<K, V[]> {
+    return elements.reduce((acc, curr) => {
+      const key = extractKey(curr);
+      let values = acc.get(key);
+      if (!values) {
+        values = [];
+        acc.set(key, values);
+      }
+      values.push(curr);
+      return acc;
+    }, new Map<K, V[]>());
+  }
+
+  private monacoEditor(widget: EditorWidget): MonacoEditor | undefined;
+  private monacoEditor(
+    uri: string | monaco.Uri
+  ): Promise<MonacoEditor | undefined>;
+  private monacoEditor(
+    uriOrWidget: string | monaco.Uri | EditorWidget
+  ): MaybePromise<MonacoEditor | undefined> {
+    if (uriOrWidget instanceof EditorWidget) {
+      const editor = uriOrWidget.editor;
+      if (editor instanceof MonacoEditor) {
+        return editor;
+      }
+      return undefined;
+    } else {
+      return this.editorManager
+        .getByUri(new URI(uriOrWidget))
+        .then((editor) => {
+          if (editor) {
+            return this.monacoEditor(editor);
+          }
+          return undefined;
+        });
+    }
+  }
+}
+export namespace CompilerErrors {
+  export namespace Commands {
+    export const NEXT_ERROR: Command = {
+      id: 'arduino-editor-next-error',
+    };
+    export const PREVIOUS_ERROR: Command = {
+      id: 'arduino-editor-previous-error',
+    };
+    export const MARK_AS_CURRENT: Command = {
+      id: 'arduino-editor-mark-as-current-error',
+    };
+  }
+}

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

@@ -1,91 +1,291 @@
-import { inject, injectable, interfaces } from 'inversify';
+import {
+  inject,
+  injectable,
+  interfaces,
+  postConstruct,
+} from '@theia/core/shared/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 { Saveable } from '@theia/core/lib/browser/saveable';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { LabelProvider } from '@theia/core/lib/browser/label-provider';
+import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
 import { MessageService } from '@theia/core/lib/common/message-service';
-import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import { open, OpenerService } from '@theia/core/lib/browser/opener-service';
-import { MenuModelRegistry, MenuContribution } from '@theia/core/lib/common/menu';
-import { KeybindingRegistry, KeybindingContribution } from '@theia/core/lib/browser/keybinding';
-import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import { Command, CommandRegistry, CommandContribution, CommandService } from '@theia/core/lib/common/command';
-import { 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 };
+import {
+  MenuModelRegistry,
+  MenuContribution,
+} from '@theia/core/lib/common/menu';
+import {
+  KeybindingRegistry,
+  KeybindingContribution,
+} from '@theia/core/lib/browser/keybinding';
+import {
+  TabBarToolbarContribution,
+  TabBarToolbarRegistry,
+} from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import {
+  FrontendApplicationContribution,
+  FrontendApplication,
+} from '@theia/core/lib/browser/frontend-application';
+import {
+  Command,
+  CommandRegistry,
+  CommandContribution,
+  CommandService,
+} from '@theia/core/lib/common/command';
+import { SettingsService } from '../dialogs/settings/settings';
+import {
+  CurrentSketch,
+  SketchesServiceClientImpl,
+} from '../../common/protocol/sketches-service-client-impl';
+import {
+  SketchesService,
+  ConfigService,
+  FileSystemExt,
+  Sketch,
+  CoreService,
+  CoreError,
+  ResponseServiceClient,
+} from '../../common/protocol';
+import { ArduinoPreferences } from '../arduino-preferences';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import { nls } from '@theia/core';
+import { OutputChannelManager } from '../theia/output/output-channel';
+import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
+import { ExecuteWithProgress } from '../../common/protocol/progressible';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import { BoardsDataStore } from '../boards/boards-data-store';
+import { NotificationManager } from '../theia/messages/notifications-manager';
+import { MessageType } from '@theia/core/lib/common/message-service-protocol';
+import { WorkspaceService } from '../theia/workspace/workspace-service';
+
+export {
+  Command,
+  CommandRegistry,
+  MenuModelRegistry,
+  KeybindingRegistry,
+  TabBarToolbarRegistry,
+  URI,
+  Sketch,
+  open,
+};
 
 @injectable()
-export abstract class Contribution implements CommandContribution, MenuContribution, KeybindingContribution, TabBarToolbarContribution, FrontendApplicationContribution {
+export abstract class Contribution
+  implements
+    CommandContribution,
+    MenuContribution,
+    KeybindingContribution,
+    TabBarToolbarContribution,
+    FrontendApplicationContribution
+{
+  @inject(ILogger)
+  protected readonly logger: ILogger;
 
-    @inject(ILogger)
-    protected readonly logger: ILogger;
+  @inject(MessageService)
+  protected readonly messageService: MessageService;
 
-    @inject(MessageService)
-    protected readonly messageService: MessageService;
+  @inject(CommandService)
+  protected readonly commandService: CommandService;
 
-    @inject(CommandService)
-    protected readonly commandService: CommandService;
+  @inject(WorkspaceService)
+  protected readonly workspaceService: WorkspaceService;
 
-    @inject(WorkspaceService)
-    protected readonly workspaceService: WorkspaceService;
+  @inject(LabelProvider)
+  protected readonly labelProvider: LabelProvider;
 
-    @inject(EditorMode)
-    protected readonly editorMode: EditorMode;
+  @inject(SettingsService)
+  protected readonly settingsService: SettingsService;
 
-    @inject(LabelProvider)
-    protected readonly labelProvider: LabelProvider;
+  @inject(ArduinoPreferences)
+  protected readonly preferences: ArduinoPreferences;
 
-    onStart(app: FrontendApplication): MaybePromise<void> {
-    }
+  @inject(FrontendApplicationStateService)
+  protected readonly appStateService: FrontendApplicationStateService;
 
-    registerCommands(registry: CommandRegistry): void {
-    }
+  @postConstruct()
+  protected init(): void {
+    this.appStateService.reachedState('ready').then(() => this.onReady());
+  }
 
-    registerMenus(registry: MenuModelRegistry): void {
-    }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function, unused-imports/no-unused-vars
+  onStart(app: FrontendApplication): MaybePromise<void> {}
 
-    registerKeybindings(registry: KeybindingRegistry): void {
-    }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function, unused-imports/no-unused-vars
+  registerCommands(registry: CommandRegistry): void {}
 
-    registerToolbarItems(registry: TabBarToolbarRegistry): void {
-    }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function, unused-imports/no-unused-vars
+  registerMenus(registry: MenuModelRegistry): void {}
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function, unused-imports/no-unused-vars
+  registerKeybindings(registry: KeybindingRegistry): void {}
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function, unused-imports/no-unused-vars
+  registerToolbarItems(registry: TabBarToolbarRegistry): void {}
+
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  onReady(): MaybePromise<void> {}
 }
 
 @injectable()
 export abstract class SketchContribution extends Contribution {
+  @inject(FileService)
+  protected readonly fileService: FileService;
 
-    @inject(FileSystem)
-    protected readonly fileSystem: FileSystem;
+  @inject(FileSystemExt)
+  protected readonly fileSystemExt: FileSystemExt;
 
-    @inject(FileSystemExt)
-    protected readonly fileSystemExt: FileSystemExt;
+  @inject(ConfigService)
+  protected readonly configService: ConfigService;
 
-    @inject(ConfigService)
-    protected readonly configService: ConfigService;
+  @inject(SketchesService)
+  protected readonly sketchService: SketchesService;
 
-    @inject(SketchesService)
-    protected readonly sketchService: SketchesService;
+  @inject(OpenerService)
+  protected readonly openerService: OpenerService;
 
-    @inject(OpenerService)
-    protected readonly openerService: OpenerService;
+  @inject(SketchesServiceClientImpl)
+  protected readonly sketchServiceClient: SketchesServiceClientImpl;
 
-    @inject(SketchesServiceClientImpl)
-    protected readonly sketchServiceClient: SketchesServiceClientImpl;
+  @inject(EditorManager)
+  protected readonly editorManager: EditorManager;
 
+  @inject(OutputChannelManager)
+  protected readonly outputChannelManager: OutputChannelManager;
+
+  protected async sourceOverride(): Promise<Record<string, string>> {
+    const override: Record<string, string> = {};
+    const sketch = await this.sketchServiceClient.currentSketch();
+    if (CurrentSketch.isValid(sketch)) {
+      for (const editor of this.editorManager.all) {
+        const uri = editor.editor.uri;
+        if (Saveable.isDirty(editor) && Sketch.isInSketch(uri, sketch)) {
+          override[uri.toString()] = editor.editor.document.getText();
+        }
+      }
+    }
+    return override;
+  }
+}
+
+@injectable()
+export abstract class CoreServiceContribution extends SketchContribution {
+  @inject(BoardsDataStore)
+  protected readonly boardsDataStore: BoardsDataStore;
+
+  @inject(BoardsServiceProvider)
+  protected readonly boardsServiceProvider: BoardsServiceProvider;
+
+  @inject(CoreService)
+  private readonly coreService: CoreService;
+
+  @inject(ClipboardService)
+  private readonly clipboardService: ClipboardService;
+
+  @inject(ResponseServiceClient)
+  private readonly responseService: ResponseServiceClient;
+
+  @inject(NotificationManager)
+  private readonly notificationManager: NotificationManager;
+
+  /**
+   * This is the internal (Theia) ID of the notification that is currently visible.
+   * It's stored here as a field to be able to close it before executing any new core command (such as verify, upload, etc.)
+   */
+  private visibleNotificationId: string | undefined;
+
+  protected clearVisibleNotification(): void {
+    if (this.visibleNotificationId) {
+      this.notificationManager.clear(this.visibleNotificationId);
+      this.visibleNotificationId = undefined;
+    }
+  }
+
+  protected handleError(error: unknown): void {
+    this.tryToastErrorMessage(error);
+  }
+
+  private tryToastErrorMessage(error: unknown): void {
+    let message: undefined | string = undefined;
+    if (CoreError.is(error)) {
+      message = error.message;
+    } else if (error instanceof Error) {
+      message = error.message;
+    } else if (typeof error === 'string') {
+      message = error;
+    } else {
+      try {
+        message = JSON.stringify(error);
+      } catch {}
+    }
+    if (message) {
+      if (message.includes('Missing FQBN (Fully Qualified Board Name)')) {
+        message = nls.localize(
+          'arduino/coreContribution/noBoardSelected',
+          'No board selected. Please select your Arduino board from the Tools > Board menu.'
+        );
+      }
+      const copyAction = nls.localize(
+        'arduino/coreContribution/copyError',
+        'Copy error messages'
+      );
+      this.visibleNotificationId = this.notificationId(message, copyAction);
+      this.messageService.error(message, copyAction).then(async (action) => {
+        if (action === copyAction) {
+          const content = await this.outputChannelManager.contentOfChannel(
+            'Arduino'
+          );
+          if (content) {
+            this.clipboardService.writeText(content);
+          }
+        }
+      });
+    } else {
+      throw error;
+    }
+  }
+
+  protected async doWithProgress<T>(options: {
+    progressText: string;
+    keepOutput?: boolean;
+    task: (progressId: string, coreService: CoreService) => Promise<T>;
+  }): Promise<T> {
+    const { progressText, keepOutput, task } = options;
+    this.outputChannelManager
+      .getChannel('Arduino')
+      .show({ preserveFocus: true });
+    const result = await ExecuteWithProgress.doWithProgress({
+      messageService: this.messageService,
+      responseService: this.responseService,
+      progressText,
+      run: ({ progressId }) => task(progressId, this.coreService),
+      keepOutput,
+    });
+    return result;
+  }
+
+  private notificationId(message: string, ...actions: string[]): string {
+    return this.notificationManager.getMessageId({
+      text: message,
+      actions,
+      type: MessageType.Error,
+    });
+  }
 }
 
 export namespace Contribution {
-    export function configure<T>(bind: interfaces.Bind, serviceIdentifier: typeof Contribution): void {
-        bind(serviceIdentifier).toSelf().inSingletonScope();
-        bind(CommandContribution).toService(serviceIdentifier);
-        bind(MenuContribution).toService(serviceIdentifier);
-        bind(KeybindingContribution).toService(serviceIdentifier);
-        bind(TabBarToolbarContribution).toService(serviceIdentifier);
-        bind(FrontendApplicationContribution).toService(serviceIdentifier);
-    }
+  export function configure(
+    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/core-error-handler.ts

@@ -0,0 +1,32 @@
+import { Emitter, Event } from '@theia/core';
+import { injectable } from '@theia/core/shared/inversify';
+import { CoreError } from '../../common/protocol/core-service';
+
+@injectable()
+export class CoreErrorHandler {
+  private readonly errors: CoreError.ErrorLocation[] = [];
+  private readonly compilerErrorsDidChangeEmitter = new Emitter<
+    CoreError.ErrorLocation[]
+  >();
+
+  tryHandle(error: unknown): void {
+    if (CoreError.is(error)) {
+      this.errors.length = 0;
+      this.errors.push(...error.data);
+      this.fireCompilerErrorsDidChange();
+    }
+  }
+
+  reset(): void {
+    this.errors.length = 0;
+    this.fireCompilerErrorsDidChange();
+  }
+
+  get onCompilerErrorsDidChange(): Event<CoreError.ErrorLocation[]> {
+    return this.compilerErrorsDidChangeEmitter.event;
+  }
+
+  private fireCompilerErrorsDidChange(): void {
+    this.compilerErrorsDidChangeEmitter.fire(this.errors.slice());
+  }
+}

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

@@ -0,0 +1,41 @@
+import { nls } from '@theia/core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { ArduinoDaemon } from '../../common/protocol';
+import { Contribution, Command, CommandRegistry } from './contribution';
+
+@injectable()
+export class Daemon extends Contribution {
+  @inject(ArduinoDaemon)
+  private readonly daemon: ArduinoDaemon;
+
+  override registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(Daemon.Commands.START_DAEMON, {
+      execute: () => this.daemon.start(),
+    });
+    registry.registerCommand(Daemon.Commands.STOP_DAEMON, {
+      execute: () => this.daemon.stop(),
+    });
+    registry.registerCommand(Daemon.Commands.RESTART_DAEMON, {
+      execute: () => this.daemon.restart(),
+    });
+  }
+}
+export namespace Daemon {
+  export namespace Commands {
+    export const START_DAEMON: Command = {
+      id: 'arduino-start-daemon',
+      label: nls.localize('arduino/daemon/start', 'Start Daemon'),
+      category: 'Arduino',
+    };
+    export const STOP_DAEMON: Command = {
+      id: 'arduino-stop-daemon',
+      label: nls.localize('arduino/daemon/stop', 'Stop Daemon'),
+      category: 'Arduino',
+    };
+    export const RESTART_DAEMON: Command = {
+      id: 'arduino-restart-daemon',
+      label: nls.localize('arduino/daemon/restart', 'Restart Daemon'),
+      category: 'Arduino',
+    };
+  }
+}

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

@@ -0,0 +1,243 @@
+import { inject, injectable } from '@theia/core/shared/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';
+import { MaybePromise, MenuModelRegistry, nls } from '@theia/core/lib/common';
+import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
+import { ArduinoMenus } from '../menu/arduino-menus';
+
+import { MainMenuManager } from '../../common/main-menu-manager';
+
+const COMPILE_FOR_DEBUG_KEY = 'arduino-compile-for-debug';
+@injectable()
+export class Debug extends SketchContribution {
+  @inject(HostedPluginSupport)
+  private readonly hostedPluginSupport: HostedPluginSupport;
+
+  @inject(NotificationCenter)
+  private readonly notificationCenter: NotificationCenter;
+
+  @inject(ExecutableService)
+  private readonly executableService: ExecutableService;
+
+  @inject(BoardsService)
+  private readonly boardService: BoardsService;
+
+  @inject(BoardsServiceProvider)
+  private readonly boardsServiceProvider: BoardsServiceProvider;
+
+  @inject(MainMenuManager)
+  private readonly mainMenuManager: MainMenuManager;
+
+  /**
+   * If `undefined`, debugging is enabled. Otherwise, the reason why it's disabled.
+   */
+  private _disabledMessages?: string = nls.localize(
+    'arduino/common/noBoardSelected',
+    'No board selected'
+  ); // Initial pessimism.
+  private disabledMessageDidChangeEmitter = new Emitter<string | undefined>();
+  private onDisabledMessageDidChange =
+    this.disabledMessageDidChangeEmitter.event;
+
+  private get disabledMessage(): string | undefined {
+    return this._disabledMessages;
+  }
+  private set disabledMessage(message: string | undefined) {
+    this._disabledMessages = message;
+    this.disabledMessageDidChangeEmitter.fire(this._disabledMessages);
+  }
+
+  private readonly debugToolbarItem = {
+    id: Debug.Commands.START_DEBUGGING.id,
+    command: Debug.Commands.START_DEBUGGING.id,
+    tooltip: `${
+      this.disabledMessage
+        ? nls.localize(
+            'arduino/debug/debugWithMessage',
+            'Debug - {0}',
+            this.disabledMessage
+          )
+        : Debug.Commands.START_DEBUGGING.label
+    }`,
+    priority: 3,
+    onDidChange: this.onDisabledMessageDidChange as Event<void>,
+  };
+
+  override onStart(): void {
+    this.onDisabledMessageDidChange(
+      () =>
+        (this.debugToolbarItem.tooltip = `${
+          this.disabledMessage
+            ? nls.localize(
+                'arduino/debug/debugWithMessage',
+                'Debug - {0}',
+                this.disabledMessage
+              )
+            : Debug.Commands.START_DEBUGGING.label
+        }`)
+    );
+    this.boardsServiceProvider.onBoardsConfigChanged(({ selectedBoard }) =>
+      this.refreshState(selectedBoard)
+    );
+    this.notificationCenter.onPlatformDidInstall(() => this.refreshState());
+    this.notificationCenter.onPlatformDidUninstall(() => this.refreshState());
+  }
+
+  override onReady(): MaybePromise<void> {
+    this.refreshState();
+  }
+
+  override registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(Debug.Commands.START_DEBUGGING, {
+      execute: () => this.startDebug(),
+      isVisible: (widget) =>
+        ArduinoToolbar.is(widget) && widget.side === 'left',
+      isEnabled: () => !this.disabledMessage,
+    });
+    registry.registerCommand(Debug.Commands.TOGGLE_OPTIMIZE_FOR_DEBUG, {
+      execute: () => this.toggleCompileForDebug(),
+      isToggled: () => this.compileForDebug,
+    });
+    registry.registerCommand(Debug.Commands.IS_OPTIMIZE_FOR_DEBUG, {
+      execute: () => this.compileForDebug,
+    });
+  }
+
+  override registerToolbarItems(registry: TabBarToolbarRegistry): void {
+    registry.registerItem(this.debugToolbarItem);
+  }
+
+  override registerMenus(registry: MenuModelRegistry): void {
+    registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
+      commandId: Debug.Commands.TOGGLE_OPTIMIZE_FOR_DEBUG.id,
+      label: Debug.Commands.TOGGLE_OPTIMIZE_FOR_DEBUG.label,
+      order: '5',
+    });
+  }
+
+  private async refreshState(
+    board: Board | undefined = this.boardsServiceProvider.boardsConfig
+      .selectedBoard
+  ): Promise<void> {
+    if (!board) {
+      this.disabledMessage = nls.localize(
+        'arduino/common/noBoardSelected',
+        'No board selected'
+      );
+      return;
+    }
+    const fqbn = board.fqbn;
+    if (!fqbn) {
+      this.disabledMessage = nls.localize(
+        'arduino/debug/noPlatformInstalledFor',
+        "Platform is not installed for '{0}'",
+        board.name
+      );
+      return;
+    }
+    const details = await this.boardService.getBoardDetails({ fqbn });
+    if (!details) {
+      this.disabledMessage = nls.localize(
+        'arduino/debug/noPlatformInstalledFor',
+        "Platform is not installed for '{0}'",
+        board.name
+      );
+      return;
+    }
+    const { debuggingSupported } = details;
+    if (!debuggingSupported) {
+      this.disabledMessage = nls.localize(
+        'arduino/debug/debuggingNotSupported',
+        "Debugging is not supported by '{0}'",
+        board.name
+      );
+    } else {
+      this.disabledMessage = undefined;
+    }
+  }
+
+  private 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 (!CurrentSketch.isValid(sketch)) {
+      return;
+    }
+    const ideTempFolderUri = await this.sketchService.getIdeTempFolderUri(
+      sketch
+    );
+    const [cliPath, sketchPath, configPath] = await Promise.all([
+      this.fileService.fsPath(new URI(executables.cliUri)),
+      this.fileService.fsPath(new URI(sketch.uri)),
+      this.fileService.fsPath(new URI(ideTempFolderUri)),
+    ]);
+    const config = {
+      cliPath,
+      board: {
+        fqbn,
+        name,
+      },
+      sketchPath,
+      configPath,
+    };
+    return this.commandService.executeCommand('arduino.debug.start', config);
+  }
+
+  get compileForDebug(): boolean {
+    const value = window.localStorage.getItem(COMPILE_FOR_DEBUG_KEY);
+    return value === 'true';
+  }
+
+  async toggleCompileForDebug(): Promise<void> {
+    const oldState = this.compileForDebug;
+    const newState = !oldState;
+    window.localStorage.setItem(COMPILE_FOR_DEBUG_KEY, String(newState));
+    this.mainMenuManager.update();
+  }
+}
+export namespace Debug {
+  export namespace Commands {
+    export const START_DEBUGGING = Command.toLocalizedCommand(
+      {
+        id: 'arduino-start-debug',
+        label: 'Start Debugging',
+        category: 'Arduino',
+      },
+      'vscode/debug.contribution/startDebuggingHelp'
+    );
+    export const TOGGLE_OPTIMIZE_FOR_DEBUG = Command.toLocalizedCommand(
+      {
+        id: 'arduino-toggle-optimize-for-debug',
+        label: 'Optimize for Debugging',
+        category: 'Arduino',
+      },
+      'arduino/debug/optimizeForDebugging'
+    );
+    export const IS_OPTIMIZE_FOR_DEBUG: Command = {
+      id: 'arduino-is-optimize-for-debug',
+    };
+  }
+}

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

@@ -0,0 +1,45 @@
+import { injectable } from '@theia/core/shared/inversify';
+import { SketchesError } from '../../common/protocol';
+import {
+  Command,
+  CommandRegistry,
+  SketchContribution,
+  Sketch,
+} from './contribution';
+
+@injectable()
+export class DeleteSketch extends SketchContribution {
+  override registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(DeleteSketch.Commands.DELETE_SKETCH, {
+      execute: (uri: string) => this.deleteSketch(uri),
+    });
+  }
+
+  private async deleteSketch(uri: string): Promise<void> {
+    const sketch = await this.loadSketch(uri);
+    if (!sketch) {
+      console.info(`Sketch not found at ${uri}. Skipping deletion.`);
+      return;
+    }
+    return this.sketchService.deleteSketch(sketch);
+  }
+
+  private async loadSketch(uri: string): Promise<Sketch | undefined> {
+    try {
+      const sketch = await this.sketchService.loadSketch(uri);
+      return sketch;
+    } catch (err) {
+      if (SketchesError.NotFound.is(err)) {
+        return undefined;
+      }
+      throw err;
+    }
+  }
+}
+export namespace DeleteSketch {
+  export namespace Commands {
+    export const DELETE_SKETCH: Command = {
+      id: 'arduino-delete-sketch',
+    };
+  }
+}

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

@@ -1,277 +1,272 @@
-import { inject, injectable } from 'inversify';
+import { inject, injectable } from '@theia/core/shared/inversify';
 import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribution';
 import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
-import { PreferenceService } from '@theia/core/lib/browser/preferences/preference-service';
 import { MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-service';
-import { EDITOR_FONT_DEFAULTS } from '@theia/editor/lib/browser/editor-preferences';
-import { Contribution, Command, MenuModelRegistry, KeybindingRegistry, CommandRegistry } from './contribution';
+import {
+  Contribution,
+  Command,
+  MenuModelRegistry,
+  KeybindingRegistry,
+  CommandRegistry,
+} from './contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
+import { nls } from '@theia/core/lib/common';
+import type { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
+import type { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
 
 // TODO: [macOS]: to remove `Start Dictation...` and `Emoji & Symbol` see this thread: https://github.com/electron/electron/issues/8283#issuecomment-269522072
 // Depends on https://github.com/eclipse-theia/theia/pull/7964
 @injectable()
 export class EditContributions extends Contribution {
+  @inject(MonacoEditorService)
+  private readonly codeEditorService: MonacoEditorService;
 
-    @inject(MonacoEditorService)
-    protected readonly codeEditorService: MonacoEditorService;
+  @inject(ClipboardService)
+  private readonly clipboardService: ClipboardService;
 
-    @inject(ClipboardService)
-    protected readonly clipboardService: ClipboardService;
-
-    @inject(PreferenceService)
-    protected readonly preferences: PreferenceService;
-
-    registerCommands(registry: CommandRegistry): void {
-        registry.registerCommand(EditContributions.Commands.GO_TO_LINE, { execute: () => this.run('editor.action.gotoLine') });
-        registry.registerCommand(EditContributions.Commands.TOGGLE_COMMENT, { execute: () => this.run('editor.action.commentLine') });
-        registry.registerCommand(EditContributions.Commands.INDENT_LINES, { execute: () => this.run('editor.action.indentLines') });
-        registry.registerCommand(EditContributions.Commands.OUTDENT_LINES, { execute: () => this.run('editor.action.outdentLines') });
-        registry.registerCommand(EditContributions.Commands.FIND, { execute: () => this.run('actions.find') });
-        registry.registerCommand(EditContributions.Commands.FIND_NEXT, { execute: () => this.run('actions.findWithSelection') });
-        registry.registerCommand(EditContributions.Commands.FIND_PREVIOUS, { execute: () => this.run('editor.action.nextMatchFindAction') });
-        registry.registerCommand(EditContributions.Commands.USE_FOR_FIND, { execute: () => this.run('editor.action.previousSelectionMatchFindAction') });
-        registry.registerCommand(EditContributions.Commands.INCREASE_FONT_SIZE, {
-            execute: () => this.preferences.set('editor.fontSize', this.preferences.get('editor.fontSize', EDITOR_FONT_DEFAULTS.fontSize) + 1)
-        });
-        registry.registerCommand(EditContributions.Commands.DECREASE_FONT_SIZE, {
-            execute: () => this.preferences.set('editor.fontSize', this.preferences.get('editor.fontSize', EDITOR_FONT_DEFAULTS.fontSize) - 1)
-        });
-        /* Tools */registry.registerCommand(EditContributions.Commands.AUTO_FORMAT, { execute: () => this.run('editor.action.formatDocument') });
-        registry.registerCommand(EditContributions.Commands.COPY_FOR_FORUM, {
-            execute: async () => {
-                const value = await this.currentValue();
-                if (value !== undefined) {
-                    this.clipboardService.writeText(`[code]
+  override registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(EditContributions.Commands.GO_TO_LINE, {
+      execute: () => this.run('editor.action.gotoLine'),
+    });
+    registry.registerCommand(EditContributions.Commands.TOGGLE_COMMENT, {
+      execute: () => this.run('editor.action.commentLine'),
+    });
+    registry.registerCommand(EditContributions.Commands.INDENT_LINES, {
+      execute: () => this.run('editor.action.indentLines'),
+    });
+    registry.registerCommand(EditContributions.Commands.OUTDENT_LINES, {
+      execute: () => this.run('editor.action.outdentLines'),
+    });
+    registry.registerCommand(EditContributions.Commands.FIND, {
+      execute: () => this.run('actions.find'),
+    });
+    registry.registerCommand(EditContributions.Commands.FIND_NEXT, {
+      execute: () => this.run('editor.action.nextMatchFindAction'),
+    });
+    registry.registerCommand(EditContributions.Commands.FIND_PREVIOUS, {
+      execute: () => this.run('editor.action.previousMatchFindAction'),
+    });
+    registry.registerCommand(EditContributions.Commands.USE_FOR_FIND, {
+      execute: () => this.run('editor.action.previousSelectionMatchFindAction'),
+    });
+    /* Tools */ registry.registerCommand(
+      EditContributions.Commands.AUTO_FORMAT,
+      { execute: () => this.run('editor.action.formatDocument') }
+    );
+    registry.registerCommand(EditContributions.Commands.COPY_FOR_FORUM, {
+      execute: async () => {
+        const value = await this.currentValue();
+        if (value !== undefined) {
+          this.clipboardService.writeText(`\`\`\`cpp
 ${value}
-[/code]`)
-                }
-            }
-        });
-        registry.registerCommand(EditContributions.Commands.COPY_FOR_GITHUB, {
-            execute: async () => {
-                const value = await this.currentValue();
-                if (value !== undefined) {
-                    this.clipboardService.writeText(`\`\`\`cpp
-${value}
-\`\`\``)
-                }
-            }
-        });
-    }
-
-    registerMenus(registry: MenuModelRegistry): void {
-        registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
-            commandId: CommonCommands.CUT.id,
-            order: '0'
-        });
-        registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
-            commandId: CommonCommands.COPY.id,
-            order: '1'
-        });
-        registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
-            commandId: EditContributions.Commands.COPY_FOR_FORUM.id,
-            label: 'Copy for Forum',
-            order: '2'
-        });
-        registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
-            commandId: EditContributions.Commands.COPY_FOR_GITHUB.id,
-            label: 'Copy for GitHub',
-            order: '3'
-        });
-        registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
-            commandId: CommonCommands.PASTE.id,
-            order: '4'
-        });
-        registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
-            commandId: CommonCommands.SELECT_ALL.id,
-            order: '5'
-        });
-        registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
-            commandId: EditContributions.Commands.GO_TO_LINE.id,
-            label: 'Go to Line...',
-            order: '6'
-        });
-
-        registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
-            commandId: EditContributions.Commands.TOGGLE_COMMENT.id,
-            label: 'Comment/Uncomment',
-            order: '0'
-        });
-        registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
-            commandId: EditContributions.Commands.INDENT_LINES.id,
-            label: 'Increase Indent',
-            order: '1'
-        });
-        registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
-            commandId: EditContributions.Commands.OUTDENT_LINES.id,
-            label: 'Decrease Indent',
-            order: '2'
-        });
-
-        registry.registerMenuAction(ArduinoMenus.EDIT__FONT_CONTROL_GROUP, {
-            commandId: EditContributions.Commands.INCREASE_FONT_SIZE.id,
-            label: 'Increase Font Size',
-            order: '0'
-        });
-        registry.registerMenuAction(ArduinoMenus.EDIT__FONT_CONTROL_GROUP, {
-            commandId: EditContributions.Commands.DECREASE_FONT_SIZE.id,
-            label: 'Decrease Font Size',
-            order: '1'
-        });
-
-        registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
-            commandId: EditContributions.Commands.FIND.id,
-            label: 'Find',
-            order: '0'
-        });
-        registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
-            commandId: EditContributions.Commands.FIND_NEXT.id,
-            label: 'Find Next',
-            order: '1'
-        });
-        registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
-            commandId: EditContributions.Commands.FIND_PREVIOUS.id,
-            label: 'Find Previous',
-            order: '2'
-        });
-        registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
-            commandId: EditContributions.Commands.USE_FOR_FIND.id,
-            label: 'Use Selection for Find', // XXX: The Java IDE uses `Use Selection For Find`.
-            order: '3'
-        });
-
-        // `Tools`
-        registry.registerMenuAction(ArduinoMenus.TOOLS__MAIN_GROUP, {
-            commandId: EditContributions.Commands.AUTO_FORMAT.id,
-            label: 'Auto Format', // XXX: The Java IDE uses `Use Selection For Find`.
-            order: '0'
-        });
-    }
-
-    registerKeybindings(registry: KeybindingRegistry): void {
-        registry.registerKeybinding({
-            command: EditContributions.Commands.COPY_FOR_FORUM.id,
-            keybinding: 'CtrlCmd+Shift+C',
-            when: 'editorFocus'
-        });
-        registry.registerKeybinding({
-            command: EditContributions.Commands.COPY_FOR_GITHUB.id,
-            keybinding: 'CtrlCmd+Alt+C',
-            when: 'editorFocus'
-        });
-        registry.registerKeybinding({
-            command: EditContributions.Commands.GO_TO_LINE.id,
-            keybinding: 'CtrlCmd+L',
-            when: 'editorFocus'
-        });
-
-        registry.registerKeybinding({
-            command: EditContributions.Commands.TOGGLE_COMMENT.id,
-            keybinding: 'CtrlCmd+/',
-            when: 'editorFocus'
-        });
-
-        registry.registerKeybinding({
-            command: EditContributions.Commands.INCREASE_FONT_SIZE.id,
-            keybinding: 'CtrlCmd+='
-        });
-        registry.registerKeybinding({
-            command: EditContributions.Commands.DECREASE_FONT_SIZE.id,
-            keybinding: 'CtrlCmd+-'
-        });
-
-        registry.registerKeybinding({
-            command: EditContributions.Commands.FIND.id,
-            keybinding: 'CtrlCmd+F'
-        });
-        registry.registerKeybinding({
-            command: EditContributions.Commands.FIND_NEXT.id,
-            keybinding: 'CtrlCmd+G'
-        });
-        registry.registerKeybinding({
-            command: EditContributions.Commands.FIND_PREVIOUS.id,
-            keybinding: 'CtrlCmd+Shift+G'
-        });
-        registry.registerKeybinding({
-            command: EditContributions.Commands.USE_FOR_FIND.id,
-            keybinding: 'CtrlCmd+E'
-        });
-
-        // `Tools`
-        registry.registerKeybinding({
-            command: EditContributions.Commands.AUTO_FORMAT.id,
-            keybinding: 'CtrlCmd+T'
-        });
-    }
-
-    protected async current(): Promise<monaco.editor.ICodeEditor | undefined> {
-        return this.codeEditorService.getFocusedCodeEditor() || this.codeEditorService.getActiveCodeEditor();
-    }
-
-    protected async currentValue(): Promise<string | undefined> {
-        const currentEditor = await this.current();
-        if (currentEditor) {
-            const selection = currentEditor.getSelection();
-            if (!selection || selection.isEmpty()) {
-                return currentEditor.getValue();
-            }
-            return currentEditor.getModel()?.getValueInRange(selection);
+\`\`\``);
         }
-        return undefined;
-    }
+      },
+    });
+  }
 
-    protected async run(commandId: string): Promise<any> {
-        const editor = await this.current();
-        if (editor) {
-            const action = editor.getAction(commandId);
-            if (action) {
-                return action.run();
-            }
-        }
-    }
+  override registerMenus(registry: MenuModelRegistry): void {
+    registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
+      commandId: CommonCommands.CUT.id,
+      order: '0',
+    });
+    registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
+      commandId: CommonCommands.COPY.id,
+      order: '1',
+    });
+    registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
+      commandId: EditContributions.Commands.COPY_FOR_FORUM.id,
+      label: nls.localize(
+        'arduino/editor/copyForForum',
+        'Copy for Forum (Markdown)'
+      ),
+      order: '2',
+    });
+    registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
+      commandId: CommonCommands.PASTE.id,
+      order: '3',
+    });
+    registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
+      commandId: CommonCommands.SELECT_ALL.id,
+      order: '4',
+    });
+    registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
+      commandId: EditContributions.Commands.GO_TO_LINE.id,
+      label: nls.localize(
+        'vscode/standaloneStrings/gotoLineActionLabel',
+        'Go to Line...'
+      ),
+      order: '5',
+    });
 
+    registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
+      commandId: EditContributions.Commands.TOGGLE_COMMENT.id,
+      label: nls.localize(
+        'arduino/editor/commentUncomment',
+        'Comment/Uncomment'
+      ),
+      order: '0',
+    });
+    registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
+      commandId: EditContributions.Commands.INDENT_LINES.id,
+      label: nls.localize('arduino/editor/increaseIndent', 'Increase Indent'),
+      order: '1',
+    });
+    registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
+      commandId: EditContributions.Commands.OUTDENT_LINES.id,
+      label: nls.localize('arduino/editor/decreaseIndent', 'Decrease Indent'),
+      order: '2',
+    });
+    registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
+      commandId: EditContributions.Commands.AUTO_FORMAT.id,
+      label: nls.localize('arduino/editor/autoFormat', 'Auto Format'),
+      order: '3',
+    });
+
+    registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
+      commandId: EditContributions.Commands.FIND.id,
+      label: nls.localize('vscode/findController/startFindAction', 'Find'),
+      order: '0',
+    });
+    registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
+      commandId: EditContributions.Commands.FIND_NEXT.id,
+      label: nls.localize(
+        'vscode/findController/findNextMatchAction',
+        'Find Next'
+      ),
+      order: '1',
+    });
+    registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
+      commandId: EditContributions.Commands.FIND_PREVIOUS.id,
+      label: nls.localize(
+        'vscode/findController/findPreviousMatchAction',
+        'Find Previous'
+      ),
+      order: '2',
+    });
+    registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
+      commandId: EditContributions.Commands.USE_FOR_FIND.id,
+      label: nls.localize(
+        'vscode/findController/startFindWithSelectionAction',
+        'Use Selection for Find'
+      ), // XXX: The Java IDE uses `Use Selection For Find`.
+      order: '3',
+    });
+
+    // `Tools`
+    registry.registerMenuAction(ArduinoMenus.TOOLS__MAIN_GROUP, {
+      commandId: EditContributions.Commands.AUTO_FORMAT.id,
+      label: nls.localize('arduino/editor/autoFormat', 'Auto Format'), // XXX: The Java IDE uses `Use Selection For Find`.
+      order: '0',
+    });
+  }
+
+  override registerKeybindings(registry: KeybindingRegistry): void {
+    registry.registerKeybinding({
+      command: EditContributions.Commands.COPY_FOR_FORUM.id,
+      keybinding: 'CtrlCmd+Shift+C',
+      when: 'editorFocus',
+    });
+    registry.registerKeybinding({
+      command: EditContributions.Commands.GO_TO_LINE.id,
+      keybinding: 'CtrlCmd+L',
+      when: 'editorFocus',
+    });
+
+    registry.registerKeybinding({
+      command: EditContributions.Commands.TOGGLE_COMMENT.id,
+      keybinding: 'CtrlCmd+/',
+      when: 'editorFocus',
+    });
+
+    registry.registerKeybinding({
+      command: EditContributions.Commands.FIND.id,
+      keybinding: 'CtrlCmd+F',
+    });
+    registry.registerKeybinding({
+      command: EditContributions.Commands.FIND_NEXT.id,
+      keybinding: 'CtrlCmd+G',
+    });
+    registry.registerKeybinding({
+      command: EditContributions.Commands.FIND_PREVIOUS.id,
+      keybinding: 'CtrlCmd+Shift+G',
+    });
+    registry.registerKeybinding({
+      command: EditContributions.Commands.USE_FOR_FIND.id,
+      keybinding: 'CtrlCmd+E',
+    });
+
+    // `Tools`
+    registry.registerKeybinding({
+      command: EditContributions.Commands.AUTO_FORMAT.id,
+      keybinding: 'CtrlCmd+T',
+    });
+  }
+
+  protected async current(): Promise<
+    ICodeEditor | StandaloneCodeEditor | undefined
+  > {
+    return (
+      this.codeEditorService.getFocusedCodeEditor() ||
+      this.codeEditorService.getActiveCodeEditor() ||
+      undefined
+    );
+  }
+
+  protected async currentValue(): Promise<string | undefined> {
+    const currentEditor = await this.current();
+    if (currentEditor) {
+      const selection = currentEditor.getSelection();
+      if (!selection || selection.isEmpty()) {
+        return currentEditor.getValue();
+      }
+      return currentEditor.getModel()?.getValueInRange(selection);
+    }
+    return undefined;
+  }
+
+  protected async run(commandId: string): Promise<any> {
+    const editor = await this.current();
+    if (editor) {
+      const action = editor.getAction(commandId);
+      if (action) {
+        return action.run();
+      }
+    }
+  }
 }
 
 export namespace EditContributions {
-    export namespace Commands {
-        export const COPY_FOR_FORUM: Command = {
-            id: 'arduino-copy-for-forum'
-        };
-        export const COPY_FOR_GITHUB: Command = {
-            id: 'arduino-copy-for-github'
-        };
-        export const GO_TO_LINE: Command = {
-            id: 'arduino-go-to-line'
-        };
-        export const TOGGLE_COMMENT: Command = {
-            id: 'arduino-toggle-comment'
-        };
-        export const INDENT_LINES: Command = {
-            id: 'arduino-indent-lines'
-        };
-        export const OUTDENT_LINES: Command = {
-            id: 'arduino-outdent-lines'
-        };
-        export const FIND: Command = {
-            id: 'arduino-find'
-        };
-        export const FIND_NEXT: Command = {
-            id: 'arduino-find-next'
-        };
-        export const FIND_PREVIOUS: Command = {
-            id: 'arduino-find-previous'
-        };
-        export const USE_FOR_FIND: Command = {
-            id: 'arduino-for-find'
-        };
-        export const INCREASE_FONT_SIZE: Command = {
-            id: 'arduino-increase-font-size'
-        };
-        export const DECREASE_FONT_SIZE: Command = {
-            id: 'arduino-decrease-font-size'
-        };
-        export const AUTO_FORMAT: Command = {
-            id: 'arduino-auto-format' // `Auto Format` should belong to `Tool`.
-        };
-    }
+  export namespace Commands {
+    export const COPY_FOR_FORUM: Command = {
+      id: 'arduino-copy-for-forum',
+    };
+    export const GO_TO_LINE: Command = {
+      id: 'arduino-go-to-line',
+    };
+    export const TOGGLE_COMMENT: Command = {
+      id: 'arduino-toggle-comment',
+    };
+    export const INDENT_LINES: Command = {
+      id: 'arduino-indent-lines',
+    };
+    export const OUTDENT_LINES: Command = {
+      id: 'arduino-outdent-lines',
+    };
+    export const FIND: Command = {
+      id: 'arduino-find',
+    };
+    export const FIND_NEXT: Command = {
+      id: 'arduino-find-next',
+    };
+    export const FIND_PREVIOUS: Command = {
+      id: 'arduino-find-previous',
+    };
+    export const USE_FOR_FIND: Command = {
+      id: 'arduino-for-find',
+    };
+    export const AUTO_FORMAT: Command = {
+      id: 'arduino-auto-format', // `Auto Format` should belong to `Tool`.
+    };
+  }
 }

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

@@ -1,151 +1,323 @@
 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 { inject, injectable } from '@theia/core/shared/inversify';
+import { CommandHandler } from '@theia/core/lib/common/command';
+import {
+  MenuPath,
+  CompositeMenuNode,
+  SubMenuOptions,
+} from '@theia/core/lib/common/menu';
+import {
+  Disposable,
+  DisposableCollection,
+} from '@theia/core/lib/common/disposable';
 import { OpenSketch } from './open-sketch';
-import { ArduinoMenus } from '../menu/arduino-menus';
+import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
 import { MainMenuManager } from '../../common/main-menu-manager';
-import { LibraryServiceProvider } from '../library/library-service-provider';
-import { BoardsServiceClientImpl } from '../boards/boards-service-client-impl';
-import { ExamplesService, ExampleContainer } from '../../common/protocol/examples-service';
-import { SketchContribution, CommandRegistry, MenuModelRegistry } from './contribution';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import { ExamplesService } from '../../common/protocol/examples-service';
+import {
+  SketchContribution,
+  CommandRegistry,
+  MenuModelRegistry,
+} from './contribution';
+import { NotificationCenter } from '../notification-center';
+import {
+  Board,
+  SketchRef,
+  SketchContainer,
+  SketchesError,
+  Sketch,
+  CoreService,
+} from '../../common/protocol';
+import { nls } from '@theia/core/lib/common';
 
 @injectable()
 export abstract class Examples extends SketchContribution {
+  @inject(CommandRegistry)
+  private readonly commandRegistry: CommandRegistry;
 
-    @inject(CommandRegistry)
-    protected readonly commandRegistry: CommandRegistry;
+  @inject(MenuModelRegistry)
+  private readonly menuRegistry: MenuModelRegistry;
 
-    @inject(MenuModelRegistry)
-    protected readonly menuRegistry: MenuModelRegistry;
+  @inject(MainMenuManager)
+  protected readonly menuManager: MainMenuManager;
 
-    @inject(MainMenuManager)
-    protected readonly menuManager: MainMenuManager;
+  @inject(ExamplesService)
+  protected readonly examplesService: ExamplesService;
 
-    @inject(ExamplesService)
-    protected readonly examplesService: ExamplesService;
+  @inject(CoreService)
+  protected readonly coreService: CoreService;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+  @inject(BoardsServiceProvider)
+  protected readonly boardsServiceClient: BoardsServiceProvider;
 
-    protected readonly toDispose = new DisposableCollection();
+  protected readonly toDispose = new DisposableCollection();
 
-    @postConstruct()
-    init(): void {
-        this.boardsServiceClient.onBoardsConfigChanged(({ selectedBoard }) => this.handleBoardChanged(selectedBoard?.fqbn));
+  protected override init(): void {
+    super.init();
+    this.boardsServiceClient.onBoardsConfigChanged(({ selectedBoard }) =>
+      this.handleBoardChanged(selectedBoard)
+    );
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-vars
+  protected handleBoardChanged(board: Board | undefined): void {
+    // NOOP
+  }
+
+  protected abstract update(options?: {
+    board?: Board | undefined;
+    forceRefresh?: boolean;
+  }): void;
+
+  override 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,
+      nls.localize('arduino/examples/menu', 'Examples'),
+      {
+        order: '4',
+      }
+    );
+  }
 
-    protected handleBoardChanged(fqbn: string | undefined): void {
-        // NOOP
-    }
+  registerRecursively(
+    sketchContainerOrPlaceholder:
+      | SketchContainer
+      | (SketchRef | SketchContainer)[]
+      | string,
+    menuPath: MenuPath,
+    pushToDispose: DisposableCollection = new DisposableCollection(),
+    subMenuOptions?: SubMenuOptions | undefined
+  ): void {
+    if (typeof sketchContainerOrPlaceholder === 'string') {
+      const placeholder = new PlaceholderMenuNode(
+        menuPath,
+        sketchContainerOrPlaceholder
+      );
+      this.menuRegistry.registerMenuNode(menuPath, placeholder);
+      pushToDispose.push(
+        Disposable.create(() =>
+          this.menuRegistry.unregisterMenuNode(placeholder.id)
+        )
+      );
+    } else {
+      const sketches: SketchRef[] = [];
+      const children: SketchContainer[] = [];
+      let submenuPath = menuPath;
 
-    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.');
+      if (SketchContainer.is(sketchContainerOrPlaceholder)) {
+        const { label } = sketchContainerOrPlaceholder;
+        submenuPath = [...menuPath, label];
+        this.menuRegistry.registerSubmenu(submenuPath, label, subMenuOptions);
+        sketches.push(...sketchContainerOrPlaceholder.sketches);
+        children.push(...sketchContainerOrPlaceholder.children);
+      } else {
+        for (const sketchOrContainer of sketchContainerOrPlaceholder) {
+          if (SketchContainer.is(sketchOrContainer)) {
+            children.push(sketchOrContainer);
+          } else {
+            sketches.push(sketchOrContainer);
+          }
         }
-        // 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' });
+      }
+      children.forEach((child) =>
+        this.registerRecursively(child, submenuPath, pushToDispose)
+      );
+      for (const sketch of sketches) {
+        const { uri } = sketch;
+        const commandId = `arduino-open-example-${submenuPath.join(
+          ':'
+        )}--${uri}`;
+        const command = { id: commandId };
+        const handler = this.createHandler(uri);
+        pushToDispose.push(
+          this.commandRegistry.registerCommand(command, handler)
+        );
+        this.menuRegistry.registerMenuAction(submenuPath, {
+          commandId,
+          label: sketch.name,
+          order: sketch.name.toLocaleLowerCase(),
+        });
+        pushToDispose.push(
+          Disposable.create(() =>
+            this.menuRegistry.unregisterMenuAction(command)
+          )
+        );
+      }
     }
+  }
 
-    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)));
+  protected createHandler(uri: string): CommandHandler {
+    return {
+      execute: async () => {
+        const sketch = await this.clone(uri);
+        if (sketch) {
+          try {
+            return this.commandService.executeCommand(
+              OpenSketch.Commands.OPEN_SKETCH.id,
+              sketch
+            );
+          } catch (err) {
+            if (SketchesError.NotFound.is(err)) {
+              // Do not toast the error message. It's handled by the `Open Sketch` command.
+              this.update({
+                board: this.boardsServiceClient.boardsConfig.selectedBoard,
+                forceRefresh: true,
+              });
+            } else {
+              throw err;
+            }
+          }
         }
-    }
+      },
+    };
+  }
 
+  private async clone(uri: string): Promise<Sketch | undefined> {
+    try {
+      const sketch = await this.sketchService.cloneExample(uri);
+      return sketch;
+    } catch (err) {
+      if (SketchesError.NotFound.is(err)) {
+        this.messageService.error(err.message);
+        this.update({
+          board: this.boardsServiceClient.boardsConfig.selectedBoard,
+          forceRefresh: true,
+        });
+      } else {
+        throw err;
+      }
+    }
+  }
 }
 
 @injectable()
 export class BuiltInExamples extends Examples {
+  override async onReady(): Promise<void> {
+    this.update(); // no `await`
+  }
 
-    onStart(): void {
-        this.register(); // no `await`
+  protected override async update(): Promise<void> {
+    let sketchContainers: SketchContainer[] | undefined;
+    try {
+      sketchContainers = await this.examplesService.builtIns();
+    } catch (e) {
+      console.error('Could not initialize built-in examples.', e);
+      this.messageService.error(
+        nls.localize(
+          'arduino/examples/couldNotInitializeExamples',
+          'Could not initialize built-in examples.'
+        )
+      );
+      return;
     }
-
-    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();
+    this.toDispose.dispose();
+    for (const container of [
+      nls.localize('arduino/examples/builtInExamples', 'Built-in examples'),
+      ...sketchContainers,
+    ]) {
+      this.registerRecursively(
+        container,
+        ArduinoMenus.EXAMPLES__BUILT_IN_GROUP,
+        this.toDispose
+      );
     }
-
+    this.menuManager.update();
+  }
 }
 
 @injectable()
 export class LibraryExamples extends Examples {
+  @inject(NotificationCenter)
+  private readonly notificationCenter: NotificationCenter;
 
-    @inject(LibraryServiceProvider)
-    protected readonly libraryServiceProvider: LibraryServiceProvider;
+  private readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
 
-    protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
+  override onStart(): void {
+    this.notificationCenter.onLibraryDidInstall(() => this.update());
+    this.notificationCenter.onLibraryDidUninstall(() => this.update());
+  }
 
-    onStart(): void {
-        this.register(); // no `await`
-        this.libraryServiceProvider.onLibraryPackageInstalled(() => this.register());
-        this.libraryServiceProvider.onLibraryPackageUninstalled(() => this.register());
+  override async onReady(): Promise<void> {
+    this.update(); // no `await`
+  }
+
+  protected override handleBoardChanged(board: Board | undefined): void {
+    this.update({ board });
+  }
+
+  protected override async update(
+    options: { board?: Board; forceRefresh?: boolean } = {
+      board: this.boardsServiceClient.boardsConfig.selectedBoard,
     }
-
-    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();
-        });
-    }
-
+  ): Promise<void> {
+    const { board, forceRefresh } = options;
+    return this.queue.add(async () => {
+      this.toDispose.dispose();
+      if (forceRefresh) {
+        await this.coreService.refresh();
+      }
+      const fqbn = board?.fqbn;
+      const name = board?.name;
+      // Shows all examples when no board is selected, or the platform of the currently selected board is not installed.
+      const { user, current, any } = await this.examplesService.installed({
+        fqbn,
+      });
+      if (user.length) {
+        (user as any).unshift(
+          nls.localize(
+            'arduino/examples/customLibrary',
+            'Examples from Custom Libraries'
+          )
+        );
+      }
+      if (name && fqbn && current.length) {
+        (current as any).unshift(
+          nls.localize('arduino/examples/for', 'Examples for {0}', name)
+        );
+      }
+      if (any.length) {
+        (any as any).unshift(
+          nls.localize('arduino/examples/forAny', 'Examples for any board')
+        );
+      }
+      for (const container of user) {
+        this.registerRecursively(
+          container,
+          ArduinoMenus.EXAMPLES__USER_LIBS_GROUP,
+          this.toDispose
+        );
+      }
+      for (const container of current) {
+        this.registerRecursively(
+          container,
+          ArduinoMenus.EXAMPLES__CURRENT_BOARD_GROUP,
+          this.toDispose
+        );
+      }
+      for (const container of any) {
+        this.registerRecursively(
+          container,
+          ArduinoMenus.EXAMPLES__ANY_BOARD_GROUP,
+          this.toDispose
+        );
+      }
+      this.menuManager.update();
+    });
+  }
 }

arduino-ide-extension/src/browser/contributions/first-startup-installer.ts

@@ -0,0 +1,104 @@
+import { LocalStorageService } from '@theia/core/lib/browser';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import {
+  BoardsService,
+  LibraryLocation,
+  LibraryService,
+} from '../../common/protocol';
+import { Contribution } from './contribution';
+
+const Arduino_BuiltIn = 'Arduino_BuiltIn';
+
+@injectable()
+export class FirstStartupInstaller extends Contribution {
+  @inject(LocalStorageService)
+  private readonly localStorageService: LocalStorageService;
+  @inject(BoardsService)
+  private readonly boardsService: BoardsService;
+  @inject(LibraryService)
+  private readonly libraryService: LibraryService;
+
+  override async onReady(): Promise<void> {
+    const isFirstStartup = !(await this.localStorageService.getData(
+      FirstStartupInstaller.INIT_LIBS_AND_PACKAGES
+    ));
+    if (isFirstStartup) {
+      const avrPackage = await this.boardsService.getBoardPackage({
+        id: 'arduino:avr',
+      });
+      const builtInLibrary = (
+        await this.libraryService.search({ query: Arduino_BuiltIn })
+      ).find(({ name }) => name === Arduino_BuiltIn); // Filter by `name` to ensure "exact match". See: https://github.com/arduino/arduino-ide/issues/1526.
+
+      let avrPackageError: Error | undefined;
+      let builtInLibraryError: Error | undefined;
+
+      if (avrPackage) {
+        try {
+          await this.boardsService.install({
+            item: avrPackage,
+            noOverwrite: true, // We don't want to automatically replace custom platforms the user might already have in place
+          });
+        } catch (e) {
+          // There's no error code, I need to parse the error message: https://github.com/arduino/arduino-cli/commit/ffe4232b359fcfa87238d68acf1c3b64a1621f14#diff-10ffbdde46838dd9caa881fd1f2a5326a49f8061f6cfd7c9d430b4875a6b6895R62
+          if (
+            e.message.includes(
+              `Platform ${avrPackage.id}@${avrPackage.installedVersion} already installed`
+            )
+          ) {
+            // If arduino:avr installation fails because it's already installed we don't want to retry on next start-up
+            console.error(e);
+          } else {
+            // But if there is any other error (e.g.: no Internet connection), we want to retry next time
+            avrPackageError = e;
+          }
+        }
+      } else {
+        avrPackageError = new Error('Could not find platform.');
+      }
+
+      if (builtInLibrary) {
+        try {
+          await this.libraryService.install({
+            item: builtInLibrary,
+            installDependencies: true,
+            noOverwrite: true, // We don't want to automatically replace custom libraries the user might already have in place
+            installLocation: LibraryLocation.BUILTIN,
+          });
+        } catch (e) {
+          // There's no error code, I need to parse the error message: https://github.com/arduino/arduino-cli/commit/2ea3608453b17b1157f8a1dc892af2e13e40f4f0#diff-1de7569144d4e260f8dde0e0d00a4e2a218c57966d583da1687a70d518986649R95
+          if (/Library (.*) is already installed/.test(e.message)) {
+            // If Arduino_BuiltIn installation fails because it's already installed we don't want to retry on next start-up
+            console.log('error installing core', e);
+          } else {
+            // But if there is any other error (e.g.: no Internet connection), we want to retry next time
+            builtInLibraryError = e;
+          }
+        }
+      } else {
+        builtInLibraryError = new Error('Could not find library');
+      }
+
+      if (avrPackageError) {
+        this.messageService.error(
+          `Could not install Arduino AVR platform: ${avrPackageError}`
+        );
+      }
+      if (builtInLibraryError) {
+        this.messageService.error(
+          `Could not install ${Arduino_BuiltIn} library: ${builtInLibraryError}`
+        );
+      }
+
+      if (!avrPackageError && !builtInLibraryError) {
+        await this.localStorageService.setData(
+          FirstStartupInstaller.INIT_LIBS_AND_PACKAGES,
+          true
+        );
+      }
+    }
+  }
+}
+export namespace FirstStartupInstaller {
+  export const INIT_LIBS_AND_PACKAGES = 'initializedLibsAndPackages';
+}

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

@@ -0,0 +1,78 @@
+import { MaybePromise } from '@theia/core';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import * as monaco from '@theia/monaco-editor-core';
+import { Formatter } from '../../common/protocol/formatter';
+import { InoSelector } from '../selectors';
+import { Contribution, URI } from './contribution';
+
+@injectable()
+export class Format
+  extends Contribution
+  implements
+    monaco.languages.DocumentRangeFormattingEditProvider,
+    monaco.languages.DocumentFormattingEditProvider
+{
+  @inject(Formatter)
+  private readonly formatter: Formatter;
+
+  override onStart(): MaybePromise<void> {
+    monaco.languages.registerDocumentRangeFormattingEditProvider(
+      InoSelector,
+      this
+    );
+    monaco.languages.registerDocumentFormattingEditProvider(InoSelector, this);
+  }
+  async provideDocumentRangeFormattingEdits(
+    model: monaco.editor.ITextModel,
+    range: monaco.Range,
+    options: monaco.languages.FormattingOptions,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _token: monaco.CancellationToken
+  ): Promise<monaco.languages.TextEdit[]> {
+    const text = await this.format(model, range, options);
+    return [{ range, text }];
+  }
+
+  async provideDocumentFormattingEdits(
+    model: monaco.editor.ITextModel,
+    options: monaco.languages.FormattingOptions,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _token: monaco.CancellationToken
+  ): Promise<monaco.languages.TextEdit[]> {
+    const range = model.getFullModelRange();
+    const text = await this.format(model, range, options);
+    return [{ range, text }];
+  }
+
+  /**
+   * From the currently opened workspaces (IDE2 has always one), it calculates all possible
+   * folder locations where the `.clang-format` file could be.
+   */
+  private formatterConfigFolderUris(model: monaco.editor.ITextModel): string[] {
+    const editorUri = new URI(model.uri.toString());
+    return this.workspaceService
+      .tryGetRoots()
+      .map(({ resource }) => resource)
+      .filter((workspaceUri) => workspaceUri.isEqualOrParent(editorUri))
+      .map((uri) => uri.toString());
+  }
+
+  private format(
+    model: monaco.editor.ITextModel,
+    range: monaco.Range,
+    options: monaco.languages.FormattingOptions
+  ): Promise<string> {
+    console.info(
+      `Formatting ${model.uri.toString()} [Range: ${JSON.stringify(
+        range.toJSON()
+      )}]`
+    );
+    const content = model.getValueInRange(range);
+    const formatterConfigFolderUris = this.formatterConfigFolderUris(model);
+    return this.formatter.format({
+      content,
+      formatterConfigFolderUris,
+      options,
+    });
+  }
+}

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

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

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

@@ -1,156 +1,235 @@
 import * as PQueue from 'p-queue';
-import { inject, injectable } from 'inversify';
+import { inject, injectable } from '@theia/core/shared/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 } from '../../common/protocol';
+import {
+  Disposable,
+  DisposableCollection,
+} from '@theia/core/lib/common/disposable';
+import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
+import { LibraryPackage, LibraryService } from '../../common/protocol';
 import { MainMenuManager } from '../../common/main-menu-manager';
 import { LibraryListWidget } from '../library/library-list-widget';
-import { LibraryServiceProvider } from '../library/library-service-provider';
-import { BoardsServiceClientImpl } from '../boards/boards-service-client-impl';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
 import { SketchContribution, Command, CommandRegistry } from './contribution';
+import { NotificationCenter } from '../notification-center';
+import { nls } from '@theia/core/lib/common';
+import * as monaco from '@theia/monaco-editor-core';
+import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
 
 @injectable()
 export class IncludeLibrary extends SketchContribution {
+  @inject(CommandRegistry)
+  protected readonly commandRegistry: CommandRegistry;
 
-    @inject(CommandRegistry)
-    protected readonly commandRegistry: CommandRegistry;
+  @inject(MenuModelRegistry)
+  protected readonly menuRegistry: MenuModelRegistry;
 
-    @inject(MenuModelRegistry)
-    protected readonly menuRegistry: MenuModelRegistry;
+  @inject(MainMenuManager)
+  protected readonly mainMenuManager: MainMenuManager;
 
-    @inject(MainMenuManager)
-    protected readonly mainMenuManager: MainMenuManager;
+  @inject(EditorManager)
+  protected override readonly editorManager: EditorManager;
 
-    @inject(EditorManager)
-    protected readonly editorManager: EditorManager;
+  @inject(NotificationCenter)
+  protected readonly notificationCenter: NotificationCenter;
 
-    @inject(LibraryServiceProvider)
-    protected readonly libraryServiceProvider: LibraryServiceProvider;
+  @inject(BoardsServiceProvider)
+  protected readonly boardsServiceClient: BoardsServiceProvider;
 
-    @inject(BoardsServiceClientImpl)
-    protected readonly boardsServiceClient: BoardsServiceClientImpl;
+  @inject(LibraryService)
+  protected readonly libraryService: LibraryService;
 
-    protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
-    protected readonly toDispose = new DisposableCollection();
+  protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
+  protected readonly toDispose = new DisposableCollection();
 
-    onStart(): void {
-        this.updateMenuActions();
-        this.boardsServiceClient.onBoardsConfigChanged(() => this.updateMenuActions())
-        this.libraryServiceProvider.onLibraryPackageInstalled(() => this.updateMenuActions());
-        this.libraryServiceProvider.onLibraryPackageUninstalled(() => this.updateMenuActions());
-    }
+  override onStart(): void {
+    this.boardsServiceClient.onBoardsConfigChanged(() =>
+      this.updateMenuActions()
+    );
+    this.notificationCenter.onLibraryDidInstall(() => this.updateMenuActions());
+    this.notificationCenter.onLibraryDidUninstall(() =>
+      this.updateMenuActions()
+    );
+  }
 
-    registerCommands(registry: CommandRegistry): void {
-        registry.registerCommand(IncludeLibrary.Commands.INCLUDE_LIBRARY, {
-            execute: async arg => {
-                if (LibraryPackage.is(arg)) {
-                    this.includeLibrary(arg);
-                }
-            }
-        });
-    }
+  override async onReady(): Promise<void> {
+    this.updateMenuActions();
+  }
 
-    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.libraryServiceProvider.list({ fqbn }));
-            }
+  override registerMenus(registry: MenuModelRegistry): void {
+    // `Include Library` submenu
+    const includeLibMenuPath = [
+      ...ArduinoMenus.SKETCH__UTILS_GROUP,
+      '0_include',
+    ];
+    registry.registerSubmenu(
+      includeLibMenuPath,
+      nls.localize('arduino/library/include', 'Include Library'),
+      {
+        order: '1',
+      }
+    );
+    // `Manage Libraries...` group.
+    registry.registerMenuAction([...includeLibMenuPath, '0_manage'], {
+      commandId: `${LibraryListWidget.WIDGET_ID}:toggle`,
+      label: nls.localize(
+        'arduino/library/manageLibraries',
+        'Manage Libraries...'
+      ),
+    });
+  }
 
-            // `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` })));
+  override registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(IncludeLibrary.Commands.INCLUDE_LIBRARY, {
+      execute: async (arg) => {
+        if (LibraryPackage.is(arg)) {
+          this.includeLibrary(arg);
+        }
+      },
+    });
+  }
 
-            // `Add .ZIP Library...`
-            // TODO: implement it
+  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;
+      // Show all libraries, when no board is selected.
+      // Otherwise, show libraries only for the selected board.
+      libraries.push(...(await this.libraryService.list({ fqbn })));
 
-            // `Arduino libraries`
-            const packageMenuPath = [...includeLibMenuPath, '2_arduino'];
-            const userMenuPath = [...includeLibMenuPath, '3_contributed'];
-            for (const library of libraries) {
-                this.toDispose.push(this.registerLibrary(library, library.location === LibraryLocation.USER ? userMenuPath : packageMenuPath));
-            }
+      const includeLibMenuPath = [
+        ...ArduinoMenus.SKETCH__UTILS_GROUP,
+        '0_include',
+      ];
+      // `Add .ZIP Library...`
+      // TODO: implement it
 
-            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)),
+      // `Arduino libraries`
+      const packageMenuPath = [...includeLibMenuPath, '2_arduino'];
+      const userMenuPath = [...includeLibMenuPath, '3_contributed'];
+      const { user, rest } = LibraryPackage.groupByLocation(libraries);
+      if (rest.length) {
+        (rest as any).unshift(
+          nls.localize('arduino/library/arduinoLibraries', 'Arduino libraries')
         );
+      }
+      if (user.length) {
+        (user as any).unshift(
+          nls.localize(
+            'arduino/library/contributedLibraries',
+            'Contributed libraries'
+          )
+        );
+      }
+
+      for (const library of user) {
+        this.toDispose.push(this.registerLibrary(library, userMenuPath));
+      }
+      for (const library of rest) {
+        this.toDispose.push(this.registerLibrary(library, packageMenuPath));
+      }
+
+      this.mainMenuManager.update();
+    });
+  }
+
+  protected registerLibrary(
+    libraryOrPlaceholder: LibraryPackage | string,
+    menuPath: MenuPath
+  ): Disposable {
+    if (typeof libraryOrPlaceholder === 'string') {
+      const placeholder = new PlaceholderMenuNode(
+        menuPath,
+        libraryOrPlaceholder
+      );
+      this.menuRegistry.registerMenuNode(menuPath, placeholder);
+      return Disposable.create(() =>
+        this.menuRegistry.unregisterMenuNode(placeholder.id)
+      );
+    }
+    const commandId = `arduino-include-library--${libraryOrPlaceholder.name}:${libraryOrPlaceholder.author}`;
+    const command = { id: commandId };
+    const handler = {
+      execute: () =>
+        this.commandRegistry.executeCommand(
+          IncludeLibrary.Commands.INCLUDE_LIBRARY.id,
+          libraryOrPlaceholder
+        ),
+    };
+    const menuAction = { commandId, label: libraryOrPlaceholder.name };
+    this.menuRegistry.registerMenuAction(menuPath, menuAction);
+    return new DisposableCollection(
+      this.commandRegistry.registerCommand(command, handler),
+      Disposable.create(() =>
+        this.menuRegistry.unregisterMenuAction(menuAction)
+      )
+    );
+  }
+
+  protected async includeLibrary(library: LibraryPackage): Promise<void> {
+    const sketch = await this.sketchServiceClient.currentSketch();
+    if (!CurrentSketch.isValid(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();
+      }
     }
 
-    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.
+    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'
-        };
-    }
+  export namespace Commands {
+    export const INCLUDE_LIBRARY: Command = {
+      id: 'arduino-include-library',
+    };
+  }
 }