chore: use version 2.3.0 for the next release

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>

.eslintrc.js

@@ -10,14 +10,17 @@ module.exports = {
   ignorePatterns: [
     'node_modules/*',
     '**/node_modules/*',
-        '.node_modules/*',
     '.github/*',
     '.browser_modules/*',
     'docs/*',
     'scripts/*',
-        'electron-app/*',
-        'plugins/*',
+    'electron-app/lib/*',
+    'electron-app/src-gen/*',
+    'electron-app/gen-webpack*.js',
+    '!electron-app/webpack.config.js',
+    'electron-app/plugins/*',
     'arduino-ide-extension/src/node/cli-protocol',
+    '**/lib/*',
   ],
   settings: {
     react: {

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,7 +1,7 @@
 name: Bug report
 description: Report a problem with the code or documentation in this repository.
 labels:
-  - "type: imperfection"
+  - 'type: imperfection'
 body:
   - type: textarea
     id: description

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,7 +1,7 @@
 name: Feature request
 description: Suggest an enhancement to this project.
 labels:
-  - "type: enhancement"
+  - 'type: enhancement'
 body:
   - type: textarea
     id: description

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,18 @@
 ### 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)
+- [ ] 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

@@ -12,4 +12,4 @@ updates:
     schedule:
       interval: daily
     labels:
-      - "topic: infrastructure"
+      - 'topic: infrastructure'

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

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

.github/workflows/assets/linux.Dockerfile

@@ -0,0 +1,112 @@
+# The Arduino IDE Linux build workflow job runs in this container.
+# syntax=docker/dockerfile:1
+
+FROM ubuntu:18.04
+
+# See: https://unofficial-builds.nodejs.org/download/release/
+ARG node_version="18.17.1"
+
+RUN \
+  apt-get \
+    --yes \
+    update
+
+# This is required to get add-apt-repository
+RUN \
+  apt-get \
+    --yes \
+    install \
+      "software-properties-common=0.96.24.32.22"
+
+# Install Git
+# The PPA is required to get a modern version of Git. The version in the Ubuntu 18.04 package repository is 2.17.1,
+# while action/checkout@v3 requires 2.18 or higher.
+RUN \
+  add-apt-repository \
+    --yes \
+    "ppa:git-core/ppa" && \
+  apt-get \
+    --yes \
+    update && \
+  \
+  apt-get \
+    --yes \
+    install \
+      "git" && \
+  \
+  apt-get \
+    --yes \
+    purge \
+      "software-properties-common"
+
+# The repository path must be added to safe.directory, otherwise any Git operations on it would fail with a
+# "dubious ownership" error. actions/checkout configures this, but it is not applied to containers.
+RUN \
+  git config \
+    --add \
+    --global \
+    "safe.directory" "/__w/arduino-ide/arduino-ide"
+ENV \
+  GIT_CONFIG_GLOBAL="/root/.gitconfig"
+
+# Install Python
+# The Python installed by actions/setup-python has dependency on a higher version of glibc than available in the
+# ubuntu:18.04 container.
+RUN \
+  apt-get \
+    --yes \
+    install \
+      "python3.8-minimal=3.8.0-3ubuntu1~18.04.2" && \
+  \
+  ln \
+    --symbolic \
+    --force \
+    "$(which python3.8)" \
+    "/usr/bin/python3"
+
+# Install Theia's package dependencies
+# These are pre-installed in the GitHub Actions hosted runner machines.
+RUN \
+  apt-get \
+    --yes \
+    install \
+      "libsecret-1-dev=0.18.6-1" \
+      "libx11-dev=2:1.6.4-3ubuntu0.4" \
+      "libxkbfile-dev=1:1.0.9-2"
+
+# Install Node.js
+# It is necessary to use the "unofficial" linux-x64-glibc-217 build because the official Node.js 18.x is dynamically
+# linked against glibc 2.28, while Ubuntu 18.04 has glibc 2.27.
+ARG node_installation_path="/tmp/node-installation"
+ARG artifact_name="node-v${node_version}-linux-x64-glibc-217"
+RUN \
+  mkdir "$node_installation_path" && \
+  cd "$node_installation_path" && \
+  \
+  apt-get \
+    --yes \
+    install \
+      "wget=1.19.4-1ubuntu2.2" && \
+  \
+  archive_name="${artifact_name}.tar.xz" && \
+  wget \
+    "https://unofficial-builds.nodejs.org/download/release/v${node_version}/${archive_name}" && \
+  \
+  apt-get \
+    --yes \
+    purge \
+      "wget" && \
+  \
+  tar \
+    --file="$archive_name" \
+    --extract && \
+  rm "$archive_name"
+ENV PATH="${PATH}:${node_installation_path}/${artifact_name}/bin"
+
+# Install Yarn
+# Yarn is pre-installed in the GitHub Actions hosted runner machines.
+RUN \
+  npm \
+    install \
+    --global \
+      "yarn@1.22.19"

.github/workflows/build.yml

@@ -1,20 +1,28 @@
 name: Arduino IDE
 
 on:
+  create:
   push:
     branches:
       - main
+      - '[0-9]+.[0-9]+.x'
     paths-ignore:
       - '.github/**'
       - '!.github/workflows/build.yml'
       - '.vscode/**'
       - 'docs/**'
       - 'scripts/**'
+      - '!scripts/merge-channel-files.js'
       - 'static/**'
       - '*.md'
     tags:
       - '[0-9]+.[0-9]+.[0-9]+*'
   workflow_dispatch:
+    inputs:
+      paid-runners:
+        description: Include builds on non-free runners
+        type: boolean
+        default: false
   pull_request:
     paths-ignore:
       - '.github/**'
@@ -22,53 +30,291 @@ on:
       - '.vscode/**'
       - 'docs/**'
       - 'scripts/**'
+      - '!scripts/merge-channel-files.js'
       - '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)
+  workflow_run:
+    workflows:
+      - Push Container Images
+    branches:
+      - main
+    types: 
+      - completed
 
 env:
   # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: "1.19"
+  GO_VERSION: '1.19'
+  # See: https://github.com/actions/setup-node/#readme
+  NODE_VERSION: '18.17'
   JOB_TRANSFER_ARTIFACT: build-artifacts
   CHANGELOG_ARTIFACTS: changelog
-
-jobs:
-  build:
-    name: build (${{ matrix.config.os }})
-    strategy:
-      matrix:
-        config:
-          - 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
+  STAGED_CHANNEL_FILES_ARTIFACT: staged-channel-files
+  BASE_BUILD_DATA: |
+    - config:
+        # Human identifier for the job.
+        name: Windows
+        runs-on: windows-2019
+        # The value is a string representing a JSON document.
+        # Setting this to null causes the job to run directly in the runner machine instead of in a container.
+        container: |
+          null
+        # Name of the secret that contains the certificate.
+        certificate-secret: WINDOWS_SIGNING_CERTIFICATE_PFX
+        # Name of the secret that contains the certificate password.
+        certificate-password-secret: WINDOWS_SIGNING_CERTIFICATE_PASSWORD
+        # File extension for the certificate.
+        certificate-extension: pfx
+        # Quoting on the value is required here to allow the same comparison expression syntax to be used for this
+        # and the companion needs.select-targets.outputs.merge-channel-files property (output values always have string
+        # type).
+        mergeable-channel-file: 'false'
+      artifacts:
+        - 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
+    - config:
+        name: Linux
+        runs-on: ubuntu-latest
+        container: |
+          {
+            \"image\": \"ghcr.io/arduino/arduino-ide/linux:main\"
+          }
+        mergeable-channel-file: 'false'
+      artifacts:
+        - path: '*Linux_64bit.zip'
+          name: Linux_X86-64_zip
+        - path: '*Linux_64bit.AppImage'
+          name: Linux_X86-64_app_image
+    - config:
+        name: macOS x86
+        runs-on: macos-latest
+        container: |
+          null
         # 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 }}
+        mergeable-channel-file: 'true'
+      artifacts:
+        - path: '*macOS_64bit.dmg'
+          name: macOS_X86-64_dmg
+        - path: '*macOS_64bit.zip'
+          name: macOS_X86-64_zip
+  PAID_RUNNER_BUILD_DATA: |
+    - config:
+        name: macOS ARM
+        runs-on: macos-latest-xlarge
+        container: |
+          null
+        certificate-secret: APPLE_SIGNING_CERTIFICATE_P12
+        certificate-password-secret: KEYCHAIN_PASSWORD
+        certificate-extension: p12
+        mergeable-channel-file: 'true'
+      artifacts:
+        - path: '*macOS_arm64.dmg'
+          name: macOS_arm64_dmg
+        - path: '*macOS_arm64.zip'
+          name: macOS_arm64_zip
+
+jobs:
+  run-determination:
+    runs-on: ubuntu-latest
+    outputs:
+      result: ${{ steps.determination.outputs.result }}
+    permissions: {}
+    steps:
+      - name: Determine if the rest of the workflow should run
+        id: determination
+        run: |
+          RELEASE_BRANCH_REGEX="refs/heads/[0-9]+.[0-9]+.x"
+          # The `create` event trigger doesn't support `branches` filters, so it's necessary to use Bash instead.
+          if [[
+            "${{ github.event_name }}" != "create" ||
+            "${{ github.ref }}" =~ $RELEASE_BRANCH_REGEX
+          ]]; then
+            # Run the other jobs.
+            RESULT="true"
+          else
+            # There is no need to run the other jobs.
+            RESULT="false"
+          fi
+
+          echo "result=$RESULT" >> $GITHUB_OUTPUT
+
+  build-type-determination:
+    needs: run-determination
+    if: needs.run-determination.outputs.result == 'true'
+    runs-on: ubuntu-latest
+    outputs:
+      is-release: ${{ steps.determination.outputs.is-release }}
+      is-nightly: ${{ steps.determination.outputs.is-nightly }}
+      channel-name: ${{ steps.determination.outputs.channel-name }}
+      publish-to-s3: ${{ steps.determination.outputs.publish-to-s3 }}
+    permissions: {}
+    steps:
+      - name: Determine the type of build
+        id: determination
+        run: |
+          if [[
+            "${{ startsWith(github.ref, 'refs/tags/') }}" == "true"
+          ]]; then
+            is_release="true"
+            is_nightly="false"
+            channel_name="stable"
+          elif [[
+            "${{ github.event_name }}" == "schedule" ||
+            (
+              "${{ github.event_name }}" == "workflow_dispatch" &&
+              "${{ github.ref }}" == "refs/heads/main"
+            )
+          ]]; then
+            is_release="false"
+            is_nightly="true"
+            channel_name="nightly"
+          else
+            is_release="false"
+            is_nightly="false"
+            channel_name="nightly"
+          fi
+
+          echo "is-release=$is_release" >> $GITHUB_OUTPUT
+          echo "is-nightly=$is_nightly" >> $GITHUB_OUTPUT
+          echo "channel-name=$channel_name" >> $GITHUB_OUTPUT
+          # Only attempt upload to Amazon S3 if the credentials are available.
+          echo "publish-to-s3=${{ secrets.AWS_SECRET_ACCESS_KEY != '' }}" >> $GITHUB_OUTPUT
+
+  select-targets:
+    needs: build-type-determination
+    runs-on: ubuntu-latest
+    outputs:
+      artifact-matrix: ${{ steps.assemble.outputs.artifact-matrix }}
+      build-matrix: ${{ steps.assemble.outputs.build-matrix }}
+      merge-channel-files: ${{ steps.assemble.outputs.merge-channel-files }}
+    permissions: {}
+    steps:
+      - name: Assemble target data
+        id: assemble
+        run: |
+          # Only run the builds that incur runner charges on release or select manually triggered runs.
+          if [[
+            "${{ needs.build-type-determination.outputs.is-release }}" == "true" ||
+            "${{ github.event.inputs.paid-runners }}" == "true"
+          ]]; then
+            build_matrix="$(
+              (
+                echo "${{ env.BASE_BUILD_DATA }}";
+                echo "${{ env.PAID_RUNNER_BUILD_DATA }}"
+              ) | \
+              yq \
+                --output-format json \
+                '[.[].config]'
+            )"
+
+            artifact_matrix="$(
+              (
+                echo "${{ env.BASE_BUILD_DATA }}";
+                echo "${{ env.PAID_RUNNER_BUILD_DATA }}"
+              ) | \
+              yq \
+                --output-format json \
+                '[.[].artifacts.[]]'
+            )"
+
+            # The build matrix produces two macOS jobs (x86 and ARM) so the "channel update info files"
+            # generated by each must be merged.
+            merge_channel_files="true"
+
+          else
+            build_matrix="$(
+              echo "${{ env.BASE_BUILD_DATA }}" | \
+              yq \
+                --output-format json \
+                '[.[].config]'
+            )"
+
+            artifact_matrix="$(
+              echo "${{ env.BASE_BUILD_DATA }}" | \
+              yq \
+                --output-format json \
+                '[.[].artifacts.[]]'
+            )"
+
+            merge_channel_files="false"
+          fi
+
+          # Set workflow step outputs.
+          # See: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
+          delimiter="$RANDOM"
+          echo "build-matrix<<$delimiter" >> $GITHUB_OUTPUT
+          echo "$build_matrix" >> $GITHUB_OUTPUT
+          echo "$delimiter" >> $GITHUB_OUTPUT
+
+          delimiter="$RANDOM"
+          echo "artifact-matrix<<$delimiter" >> $GITHUB_OUTPUT
+          echo "$artifact_matrix" >> $GITHUB_OUTPUT
+          echo "$delimiter" >> $GITHUB_OUTPUT
+
+          echo "merge-channel-files=$merge_channel_files" >> $GITHUB_OUTPUT
+
+  build:
+    name: build (${{ matrix.config.name }})
+    needs:
+      - build-type-determination
+      - select-targets
+    env:
+      # Location of artifacts generated by build.
+      BUILD_ARTIFACTS_PATH: electron-app/dist/build-artifacts
+    strategy:
+      matrix:
+        config: ${{ fromJson(needs.select-targets.outputs.build-matrix) }}
+    runs-on: ${{ matrix.config.runs-on }}
+    container: ${{ fromJSON(matrix.config.container) }}
+    defaults:
+      run:
+        # Avoid problems caused by different default shell for container jobs (sh) vs non-container jobs (bash).
+        shell: bash
+
     timeout-minutes: 90
 
     steps:
       - name: Checkout
+        if: fromJSON(matrix.config.container) == null
+        uses: actions/checkout@v4
+
+      - name: Checkout
+        # actions/checkout@v4 has dependency on a higher version of glibc than available in the Linux container.
+        if: fromJSON(matrix.config.container) != null
         uses: actions/checkout@v3
 
-      - name: Install Node.js 16.x
-        uses: actions/setup-node@v3
+      - name: Install Node.js
+        if: fromJSON(matrix.config.container) == null
+        uses: actions/setup-node@v4
         with:
-          node-version: '16.x'
+          node-version: ${{ env.NODE_VERSION }}
           registry-url: 'https://registry.npmjs.org'
+          cache: 'yarn'
 
       - name: Install Python 3.x
-        uses: actions/setup-python@v4
+        if: fromJSON(matrix.config.container) == null
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version: '3.11.x'
 
       - name: Install Go
+        if: fromJSON(matrix.config.container) == null
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Install Go
+        # actions/setup-go@v5 has dependency on a higher version of glibc than available in the Linux container.
+        if: fromJSON(matrix.config.container) != null
         uses: actions/setup-go@v4
         with:
           go-version: ${{ env.GO_VERSION }}
@@ -80,7 +326,6 @@ jobs:
           version: 3.x
 
       - name: Package
-        shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           AC_USERNAME: ${{ secrets.AC_USERNAME }}
@@ -88,9 +333,14 @@ jobs:
           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/main') }}
-          IS_RELEASE: ${{ startsWith(github.ref, 'refs/tags/') }}
+          IS_NIGHTLY: ${{ needs.build-type-determination.outputs.is-nightly }}
+          IS_RELEASE: ${{ needs.build-type-determination.outputs.is-release }}
           CAN_SIGN: ${{ secrets[matrix.config.certificate-secret] != '' }}
+          # The CREATE_* environment vars are only used to run tests. These secrets are optional. Dependent tests will
+          # be skipped if not available.
+          CREATE_USERNAME: ${{ secrets.CREATE_USERNAME }}
+          CREATE_PASSWORD: ${{ secrets.CREATE_PASSWORD }}
+          CREATE_CLIENT_SECRET: ${{ secrets.CREATE_CLIENT_SECRET }}
         run: |
           # See: https://www.electron.build/code-signing
           if [ $CAN_SIGN = false ]; then
@@ -99,44 +349,128 @@ jobs:
             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] }}"
+            export CSC_FOR_PULL_REQUEST=true
           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
+          yarn install --immutable
+
+          yarn --cwd arduino-ide-extension build
+          yarn test
+          yarn --cwd arduino-ide-extension test:slow
+          yarn --cwd arduino-ide-extension lint
+
+          yarn --cwd electron-app rebuild
+          yarn --cwd electron-app build
+          yarn --cwd electron-app package
+
+      # Both macOS jobs generate a "channel update info file" with same path and name. The second job to complete would
+      # overwrite the file generated by the first in the workflow artifact.
+      - name: Stage channel file for merge
+        if: >
+          needs.select-targets.outputs.merge-channel-files == 'true' &&
+          matrix.config.mergeable-channel-file == 'true'
+        run: |
+          staged_channel_files_path="${{ runner.temp }}/staged-channel-files"
+          mkdir "$staged_channel_files_path"
+          mv \
+            "${{ env.BUILD_ARTIFACTS_PATH }}/${{ needs.build-type-determination.outputs.channel-name }}-mac.yml" \
+            "${staged_channel_files_path}/${{ needs.build-type-determination.outputs.channel-name }}-mac-${{ runner.arch }}.yml"
+
+          # Set workflow environment variable for use in other steps.
+          # See: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#setting-an-environment-variable
+          echo "STAGED_CHANNEL_FILES_PATH=$staged_channel_files_path" >> "$GITHUB_ENV"
+
+      - name: Upload staged-for-merge channel file artifact
+        uses: actions/upload-artifact@v3
+        if: >
+          needs.select-targets.outputs.merge-channel-files == 'true' &&
+          matrix.config.mergeable-channel-file == 'true'
+        with:
+          if-no-files-found: error
+          name: ${{ env.STAGED_CHANNEL_FILES_ARTIFACT }}
+          path: ${{ env.STAGED_CHANNEL_FILES_PATH }}
 
       - name: Upload [GitHub Actions]
         uses: actions/upload-artifact@v3
         with:
           name: ${{ env.JOB_TRANSFER_ARTIFACT }}
-          path: electron/build/dist/build-artifacts/
+          path: ${{ env.BUILD_ARTIFACTS_PATH }}
+
+  merge-channel-files:
+    needs:
+      - build-type-determination
+      - select-targets
+      - build
+    if: needs.select-targets.outputs.merge-channel-files == 'true'
+    runs-on: ubuntu-latest
+    permissions: {}
+    steps:
+      - name: Set environment variables
+        run: |
+          # See: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#setting-an-environment-variable
+          echo "CHANNEL_FILES_PATH=${{ runner.temp }}/channel-files" >> "$GITHUB_ENV"
+
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Download staged-for-merge channel files artifact
+        uses: actions/download-artifact@v3
+        with:
+          name: ${{ env.STAGED_CHANNEL_FILES_ARTIFACT }}
+          path: ${{ env.CHANNEL_FILES_PATH }}
+
+      - name: Remove no longer needed artifact
+        uses: geekyeggo/delete-artifact@v2
+        with:
+          name: ${{ env.STAGED_CHANNEL_FILES_ARTIFACT }}
+
+      - name: Install Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ env.NODE_VERSION }}
+          registry-url: 'https://registry.npmjs.org'
+          cache: 'yarn'
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        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: Merge "channel update info files"
+        run: |
+          node \
+            ./scripts/merge-channel-files.js \
+              --channel "${{ needs.build-type-determination.outputs.channel-name }}" \
+              --input "${{ env.CHANNEL_FILES_PATH }}"
+
+      - name: Upload merged channel files to job transfer artifact
+        uses: actions/upload-artifact@v3
+        with:
+          if-no-files-found: error
+          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          path: ${{ env.CHANNEL_FILES_PATH }}
 
   artifacts:
     name: ${{ matrix.artifact.name }} artifact
-    needs: build
+    needs:
+      - select-targets
+      - 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
+        artifact: ${{ fromJson(needs.select-targets.outputs.artifact-matrix) }}
 
     steps:
       - name: Download job transfer artifact
@@ -152,20 +486,22 @@ jobs:
           path: ${{ env.JOB_TRANSFER_ARTIFACT }}/${{ matrix.artifact.path }}
 
   changelog:
-    needs: build
+    needs:
+      - build-type-determination
+      - build
     runs-on: ubuntu-latest
     outputs:
       BODY: ${{ steps.changelog.outputs.BODY }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0 # To fetch all history for all branches and tags.
 
       - name: Generate Changelog
         id: changelog
         env:
-          IS_RELEASE: ${{ startsWith(github.ref, 'refs/tags/') }}
+          IS_RELEASE: ${{ needs.build-type-determination.outputs.is-release }}
         run: |
           export LATEST_TAG=$(git describe --abbrev=0)
           export GIT_LOG=$(git log --pretty=" - %s [%h]" $LATEST_TAG..HEAD | sed 's/ *$//g')
@@ -191,15 +527,27 @@ jobs:
           echo "$BODY" > CHANGELOG.txt
 
       - name: Upload Changelog [GitHub Actions]
-        if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main')
+        if: needs.build-type-determination.outputs.is-nightly == 'true'
         uses: actions/upload-artifact@v3
         with:
           name: ${{ env.JOB_TRANSFER_ARTIFACT }}
           path: CHANGELOG.txt
 
   publish:
-    needs: changelog
-    if: github.repository == 'arduino/arduino-ide' && (github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main'))
+    needs:
+      - build-type-determination
+      - merge-channel-files
+      - changelog
+    if: >
+      always() &&
+      needs.build-type-determination.result == 'success' &&
+      (
+        needs.merge-channel-files.result == 'skipped' ||
+        needs.merge-channel-files.result == 'success'
+      ) &&
+      needs.changelog.result == 'success' &&
+      needs.build-type-determination.outputs.publish-to-s3 == 'true' &&
+      needs.build-type-determination.outputs.is-nightly == 'true'
     runs-on: ubuntu-latest
     steps:
       - name: Download [GitHub Actions]
@@ -219,8 +567,19 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
   release:
-    needs: changelog
-    if: startsWith(github.ref, 'refs/tags/')
+    needs:
+      - build-type-determination
+      - merge-channel-files
+      - changelog
+    if: >
+      always() &&
+      needs.build-type-determination.result == 'success' &&
+      (
+        needs.merge-channel-files.result == 'skipped' ||
+        needs.merge-channel-files.result == 'success'
+      ) &&
+      needs.changelog.result == 'success' &&
+      needs.build-type-determination.outputs.is-release == 'true'
     runs-on: ubuntu-latest
     steps:
       - name: Download [GitHub Actions]
@@ -235,7 +594,7 @@ jobs:
           echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
       - name: Publish Release [GitHub]
-        uses: svenstaro/upload-release-action@2.5.0
+        uses: svenstaro/upload-release-action@2.7.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           release_name: ${{ steps.tag_name.outputs.TAG_NAME }}
@@ -245,7 +604,7 @@ jobs:
           body: ${{ needs.changelog.outputs.BODY }}
 
       - name: Publish Release [S3]
-        if: github.repository == 'arduino/arduino-ide'
+        if: needs.build-type-determination.outputs.publish-to-s3 == 'true'
         uses: docker://plugins/s3
         env:
           PLUGIN_SOURCE: '${{ env.JOB_TRANSFER_ARTIFACT }}/*'
@@ -259,6 +618,7 @@ jobs:
     # This job must run after all jobs that use the transfer artifact.
     needs:
       - build
+      - merge-channel-files
       - publish
       - release
       - artifacts

.github/workflows/check-certificates.yml

@@ -3,6 +3,7 @@ name: Check Certificates
 
 # See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
 on:
+  create:
   push:
     paths:
       - '.github/workflows/check-certificates.ya?ml'
@@ -20,12 +21,49 @@ env:
   EXPIRATION_WARNING_PERIOD: 30
 
 jobs:
+  run-determination:
+    runs-on: ubuntu-latest
+    outputs:
+      result: ${{ steps.determination.outputs.result }}
+    steps:
+      - name: Determine if the rest of the workflow should run
+        id: determination
+        run: |
+          RELEASE_BRANCH_REGEX="refs/heads/[0-9]+.[0-9]+.x"
+          REPO_SLUG="arduino/arduino-ide"
+          if [[
+            (
+              # Only run on branch creation when it is a release branch.
+              # The `create` event trigger doesn't support `branches` filters, so it's necessary to use Bash instead.
+              "${{ github.event_name }}" != "create" ||
+              "${{ github.ref }}" =~ $RELEASE_BRANCH_REGEX
+            ) &&
+            (
+              # Only run when the workflow will have access to the certificate secrets.
+              # This could be done via a GitHub Actions workflow conditional, but makes more sense to do it here as well.
+              (
+                "${{ github.event_name }}" != "pull_request" &&
+                "${{ github.repository }}" == "$REPO_SLUG"
+              ) ||
+              (
+                "${{ github.event_name }}" == "pull_request" &&
+                "${{ github.event.pull_request.head.repo.full_name }}" == "$REPO_SLUG"
+              )
+            )
+          ]]; then
+            # Run the other jobs.
+            RESULT="true"
+          else
+            # There is no need to run the other jobs.
+            RESULT="false"
+          fi
+
+          echo "result=$RESULT" >> $GITHUB_OUTPUT
+
   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')
+    needs: run-determination
+    if: needs.run-determination.outputs.result == 'true'
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false

.github/workflows/check-containers.yml

@@ -0,0 +1,58 @@
+name: Check Containers
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/check-containers.ya?ml"
+      - "**.Dockerfile"
+      - "**/Dockerfile"
+  push:
+    paths:
+      - ".github/workflows/check-containers.ya?ml"
+      - "**.Dockerfile"
+      - "**/Dockerfile"
+  repository_dispatch:
+  schedule:
+    # Run periodically to catch breakage caused by external changes.
+    - cron: "0 7 * * MON"
+  workflow_dispatch:
+
+jobs:
+  run:
+    name: Run (${{ matrix.image.path }})
+    runs-on: ubuntu-latest
+    permissions: {}
+    services:
+      registry:
+        image: registry:2
+        ports:
+          - 5000:5000
+
+    env:
+      IMAGE_NAME: name/app:latest
+      REGISTRY: localhost:5000
+
+    strategy:
+      fail-fast: false
+      matrix:
+        image:
+          - path: .github/workflows/assets/linux.Dockerfile
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Build and push to local registry
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ${{ matrix.image.path }}
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      - name: Run container
+        run: |
+          docker \
+            run \
+              --rm \
+              ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

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

@@ -2,10 +2,11 @@ name: Check Internationalization
 
 env:
   # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: "1.19"
+  GO_VERSION: '1.19'
 
 # See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
 on:
+  create:
   push:
     paths:
       - '.github/workflows/check-i18n-task.ya?ml'
@@ -22,21 +23,50 @@ on:
   repository_dispatch:
 
 jobs:
+  run-determination:
+    runs-on: ubuntu-latest
+    outputs:
+      result: ${{ steps.determination.outputs.result }}
+    permissions: {}
+    steps:
+      - name: Determine if the rest of the workflow should run
+        id: determination
+        run: |
+          RELEASE_BRANCH_REGEX="refs/heads/[0-9]+.[0-9]+.x"
+          TAG_REGEX="refs/tags/.*"
+          # The `create` event trigger doesn't support `branches` filters, so it's necessary to use Bash instead.
+          if [[
+            ("${{ github.event_name }}" != "create" ||
+            "${{ github.ref }}" =~ $RELEASE_BRANCH_REGEX) &&
+            ! "${{ github.ref }}" =~ $TAG_REGEX
+          ]]; then
+            # Run the other jobs.
+            RESULT="true"
+          else
+            # There is no need to run the other jobs.
+            RESULT="false"
+          fi
+
+          echo "result=$RESULT" >> $GITHUB_OUTPUT
+
   check:
+    needs: run-determination
+    if: needs.run-determination.outputs.result == 'true'
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install Node.js 16.x
-        uses: actions/setup-node@v3
+      - name: Install Node.js 18.17
+        uses: actions/setup-node@v4
         with:
-          node-version: '16.x'
+          node-version: '18.17'
           registry-url: 'https://registry.npmjs.org'
+          cache: 'yarn'
 
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -47,7 +77,7 @@ jobs:
           version: 3.x
 
       - name: Install dependencies
-        run: yarn
+        run: yarn install --immutable
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

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

@@ -8,7 +8,7 @@ on:
 env:
   CHANGELOG_ARTIFACTS: changelog
   # See: https://github.com/actions/setup-node/#readme
-  NODE_VERSION: 16.x
+  NODE_VERSION: '18.17'
 
 jobs:
   create-changelog:
@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           registry-url: 'https://registry.npmjs.org'
@@ -32,7 +32,7 @@ jobs:
       - name: Create full changelog
         id: full-changelog
         run: |
-          yarn add @octokit/rest --ignore-workspace-root-check
+          yarn add @octokit/rest@19.0.13 --ignore-workspace-root-check
           mkdir "${{ github.workspace }}/${{ env.CHANGELOG_ARTIFACTS }}"
 
           # Get the changelog file name to build

.github/workflows/i18n-nightly-push.yml

@@ -2,7 +2,7 @@ name: i18n-nightly-push
 
 env:
   # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: "1.19"
+  GO_VERSION: '1.19'
 
 on:
   schedule:
@@ -14,16 +14,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install Node.js 16.x
-        uses: actions/setup-node@v3
+      - name: Install Node.js 18.17
+        uses: actions/setup-node@v4
         with:
-          node-version: '16.x'
+          node-version: '18.17'
           registry-url: 'https://registry.npmjs.org'
+          cache: 'yarn'
 
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -34,7 +35,7 @@ jobs:
           version: 3.x
 
       - name: Install dependencies
-        run: yarn
+        run: yarn install --immutable
 
       - name: Run i18n:push script
         run: yarn run i18n:push

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

@@ -2,7 +2,7 @@ name: i18n-weekly-pull
 
 env:
   # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: "1.19"
+  GO_VERSION: '1.19'
 
 on:
   schedule:
@@ -14,16 +14,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Install Node.js 16.x
-        uses: actions/setup-node@v3
+      - name: Install Node.js 18.17
+        uses: actions/setup-node@v4
         with:
-          node-version: '16.x'
+          node-version: '18.17'
           registry-url: 'https://registry.npmjs.org'
+          cache: 'yarn'
 
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -34,7 +35,7 @@ jobs:
           version: 3.x
 
       - name: Install dependencies
-        run: yarn
+        run: yarn install --immutable
 
       - name: Run i18n:pull script
         run: yarn run i18n:pull
@@ -45,7 +46,7 @@ jobs:
           TRANSIFEX_API_KEY: ${{ secrets.TRANSIFEX_API_KEY }}
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: Updated translation files
           title: Update translation files

.github/workflows/push-container-images.yml

@@ -0,0 +1,70 @@
+name: Push Container Images
+
+on:
+  pull_request:
+    paths:
+      - ".github/workflows/push-container-images.ya?ml"
+  push:
+    paths:
+      - ".github/workflows/push-container-images.ya?ml"
+      - "**.Dockerfile"
+      - "**/Dockerfile"
+  repository_dispatch:
+  schedule:
+    # Run periodically to catch breakage caused by external changes.
+    - cron: "0 8 * * MON"
+  workflow_dispatch:
+
+jobs:
+  push:
+    name: Push (${{ matrix.image.name }})
+    # Only run the job when GITHUB_TOKEN has the privileges required for Container registry login.
+    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
+    permissions:
+      contents: read
+      packages: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        image:
+          - path: .github/workflows/assets/linux.Dockerfile
+            name: ${{ github.repository }}/linux
+            registry: ghcr.io
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v3
+        with:
+          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: ${{ matrix.image.registry }}
+          username: ${{ github.repository_owner }}
+
+      - name: Extract metadata for image
+        id: metadata
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ matrix.image.registry }}/${{ matrix.image.name }}
+
+      - name: Build and push image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ${{ matrix.image.path }}
+          labels: ${{ steps.metadata.outputs.labels }}
+          # Workflow is triggered on relevant events for the sake of a "dry run" validation but image is only pushed to
+          # registry on commit to the main branch.
+          push: ${{ github.ref == 'refs/heads/main' }}
+          tags: ${{ steps.metadata.outputs.tags }}

.github/workflows/sync-labels.yml

@@ -5,15 +5,15 @@ name: Sync Labels
 on:
   push:
     paths:
-      - ".github/workflows/sync-labels.ya?ml"
-      - ".github/label-configuration-files/*.ya?ml"
+      - '.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"
+      - '.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 * * *"
+    - cron: '0 8 * * *'
   workflow_dispatch:
   repository_dispatch:
 
@@ -27,7 +27,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download JSON schema for labels configuration file
         id: download-schema
@@ -106,7 +106,7 @@ jobs:
           echo "flag=--dry-run" >> $GITHUB_OUTPUT
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download configuration files artifact
         uses: actions/download-artifact@v3

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

@@ -8,24 +8,25 @@ on:
 
 env:
   # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: "1.19"
-  NODE_VERSION: 16.x
+  GO_VERSION: '1.19'
+  NODE_VERSION: '18.17'
 
 jobs:
   pull-from-jsonbin:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
           registry-url: 'https://registry.npmjs.org'
+          cache: 'yarn'
 
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -36,7 +37,7 @@ jobs:
           version: 3.x
 
       - name: Install dependencies
-        run: yarn
+        run: yarn install --immutable
 
       - name: Run themes:pull script
         run: yarn run themes:pull
@@ -54,7 +55,7 @@ jobs:
         run: yarn run themes:generate
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           commit-message: Updated themes
           title: Update themes

.gitignore

@@ -1,25 +1,22 @@
 node_modules/
-# .node_modules is a hack for the electron builder.
-.node_modules/
 lib/
 downloads/
-build/
+arduino-ide-extension/src/node/resources
 arduino-ide-extension/Examples/
-!electron/build/
 src-gen/
-webpack.config.js
 gen-webpack.config.js
+gen-webpack.node.config.js
 .DS_Store
 # switching from `electron` to `browser` in dev mode.
 .browser_modules
 yarn*.log
 # For the VS Code extensions used by Theia.
-plugins
+electron-app/plugins
 # the tokens folder for the themes
 scripts/themes/tokens
-# environment variables
-.env
 # content trace files for electron
 electron-app/traces
 # any Arduino LS generated log files
 inols*.log
+# The electron-builder output.
+electron-app/dist

.prettierignore

@@ -0,0 +1,11 @@
+lib
+dist
+plugins
+src-gen
+i18n
+gen-webpack*
+.browser_modules
+arduino-ide-extension/src/node/resources
+cli-protocol
+*color-theme.json
+arduino-icons.json

.prettierrc

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

.prettierrc.json

@@ -0,0 +1,28 @@
+{
+  "singleQuote": true,
+  "tabWidth": 2,
+  "useTabs": false,
+  "printWidth": 80,
+  "endOfLine": "auto",
+  "overrides": [
+    {
+      "files": "*.json",
+      "options": {
+        "tabWidth": 2
+      }
+    },
+    {
+      "files": "*.css",
+      "options": {
+        "tabWidth": 4,
+        "singleQuote": false
+      }
+    },
+    {
+      "files": "*.html",
+      "options": {
+        "tabWidth": 4
+      }
+    }
+  ]
+}

.vscode/launch.json

@@ -4,35 +4,33 @@
     {
       "type": "node",
       "request": "launch",
-      "name": "App (Electron) [Dev]",
-      "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
+      "name": "App",
+      "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
       "windows": {
-        "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd",
+        "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
       },
       "cwd": "${workspaceFolder}/electron-app",
       "args": [
         ".",
         "--log-level=debug",
         "--hostname=localhost",
-        "--app-project-path=${workspaceRoot}/electron-app",
+        "--app-project-path=${workspaceFolder}/electron-app",
         "--remote-debugging-port=9222",
         "--no-app-auto-install",
-        "--plugins=local-dir:../plugins",
+        "--plugins=local-dir:./plugins",
         "--hosted-plugin-inspect=9339",
-        "--content-trace",
-        "--open-devtools",
-        "--no-ping-timeout",
+        "--no-ping-timeout"
       ],
       "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"
+        "${workspaceFolder}/electron-app/lib/backend/electron-main.js",
+        "${workspaceFolder}/electron-app/lib/backend/main.js",
+        "${workspaceFolder}/electron-app/lib/**/*.js",
+        "${workspaceFolder}/arduino-ide-extension/lib/**/*.js",
+        "${workspaceFolder}/node_modules/@theia/**/*.js"
       ],
       "smartStep": true,
       "internalConsoleOptions": "openOnSessionStart",
@@ -41,33 +39,35 @@
     {
       "type": "node",
       "request": "launch",
-      "name": "App (Electron)",
-      "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
+      "name": "App [Dev]",
+      "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
       "windows": {
-        "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd",
+        "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
       },
       "cwd": "${workspaceFolder}/electron-app",
       "args": [
         ".",
         "--log-level=debug",
         "--hostname=localhost",
-        "--app-project-path=${workspaceRoot}/electron-app",
+        "--app-project-path=${workspaceFolder}/electron-app",
         "--remote-debugging-port=9222",
         "--no-app-auto-install",
-        "--plugins=local-dir:../plugins",
+        "--plugins=local-dir:./plugins",
         "--hosted-plugin-inspect=9339",
-        "--no-ping-timeout",
+        "--content-trace",
+        "--open-devtools",
+        "--no-ping-timeout"
       ],
       "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"
+        "${workspaceFolder}/electron-app/lib/backend/electron-main.js",
+        "${workspaceFolder}/electron-app/lib/backend/main.js",
+        "${workspaceFolder}/electron-app/lib/**/*.js",
+        "${workspaceFolder}/arduino-ide-extension/lib/**/*.js",
+        "${workspaceFolder}/node_modules/@theia/**/*.js"
       ],
       "smartStep": true,
       "internalConsoleOptions": "openOnSessionStart",
@@ -84,7 +84,7 @@
       "type": "node",
       "request": "launch",
       "name": "Run Test [current]",
-      "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+      "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
       "args": [
         "--require",
         "reflect-metadata/Reflect",
@@ -94,8 +94,16 @@
         "--colors",
         "**/${fileBasenameNoExtension}.js"
       ],
+      "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"
+      ],
       "env": {
-        "TS_NODE_PROJECT": "${workspaceRoot}/tsconfig.json"
+        "TS_NODE_PROJECT": "${workspaceFolder}/tsconfig.json",
+        "IDE2_TEST": "true"
       },
       "sourceMaps": true,
       "smartStep": true,
@@ -107,22 +115,12 @@
       "request": "attach",
       "name": "Attach by Process ID",
       "processId": "${command:PickProcess}"
-    },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "Electron Packager",
-      "program": "${workspaceRoot}/electron/packager/index.js",
-      "cwd": "${workspaceFolder}/electron/packager"
     }
   ],
   "compounds": [
     {
       "name": "Launch Electron Backend & Frontend",
-      "configurations": [
-        "App (Electron)",
-        "Attach to Electron Frontend"
-      ]
+      "configurations": ["App", "Attach to Electron Frontend"]
     }
   ]
 }

.vscode/settings.json

@@ -7,6 +7,6 @@
   },
   "typescript.tsdk": "node_modules/typescript/lib",
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true
-  },
+    "source.fixAll.eslint": "explicit"
+  }
 }

.vscode/tasks.json

@@ -2,10 +2,13 @@
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Arduino IDE - Rebuild Electron App",
+      "label": "Rebuild App",
       "type": "shell",
-      "command": "yarn rebuild:browser && yarn rebuild:electron",
+      "command": "yarn rebuild",
       "group": "build",
+      "options": {
+        "cwd": "${workspaceFolder}/electron-app"
+      },
       "presentation": {
         "reveal": "always",
         "panel": "new",
@@ -13,7 +16,7 @@
       }
     },
     {
-      "label": "Arduino IDE - Watch IDE Extension",
+      "label": "Watch Extension",
       "type": "shell",
       "command": "yarn --cwd ./arduino-ide-extension watch",
       "group": "build",
@@ -24,7 +27,7 @@
       }
     },
     {
-      "label": "Arduino IDE - Watch Electron App",
+      "label": "Watch App",
       "type": "shell",
       "command": "yarn --cwd ./electron-app watch",
       "group": "build",
@@ -35,12 +38,9 @@
       }
     },
     {
-      "label": "Arduino IDE - Watch All [Electron]",
+      "label": "Watch All",
       "type": "shell",
-      "dependsOn": [
-        "Arduino IDE - Watch IDE Extension",
-        "Arduino IDE - Watch Electron App"
-      ]
+      "dependsOn": ["Watch Extension", "Watch App"]
     }
   ]
 }

README.md

@@ -4,7 +4,7 @@
 
 [![Arduino IDE](https://github.com/arduino/arduino-ide/workflows/Arduino%20IDE/badge.svg)](https://github.com/arduino/arduino-ide/actions?query=workflow%3A%22Arduino+IDE%22)
 
-This 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.
+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](https://github.com/arduino/Arduino).
 
 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.
 

arduino-ide-extension/README.md

@@ -55,11 +55,13 @@ The Config Service knows about your system, like for example the default sketch
   - checking whether a file is in a data or sketch directory
 
 ### `"arduino"` configuration in the `package.json`:
- - `"cli"`:
+
+- `"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
+
+- 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**
@@ -72,11 +74,13 @@ The [**clangd** C++ language server](https://clangd.llvm.org/) and the [**ClangF
 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
+
+- 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/package.json

@@ -1,83 +1,83 @@
 {
   "name": "arduino-ide-extension",
-  "version": "2.0.5",
+  "version": "2.3.0",
   "description": "An extension for Theia building the Arduino IDE",
   "license": "AGPL-3.0-or-later",
   "scripts": {
-    "prepare": "yarn download-cli && yarn download-fwuploader && yarn download-ls && yarn copy-i18n && yarn clean && yarn download-examples && yarn build && yarn test",
+    "prepare": "yarn download-cli && yarn download-fwuploader && yarn download-ls && yarn copy-i18n && yarn download-examples",
     "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",
+    "copy-i18n": "ncp ../i18n ./src/node/resources/i18n",
     "download-ls": "node ./scripts/download-ls.js",
     "download-examples": "node ./scripts/download-examples.js",
     "generate-protocol": "node ./scripts/generate-protocol.js",
     "lint": "eslint",
-    "build": "tsc && ncp ./src/node/cli-protocol/ ./lib/node/cli-protocol/ && yarn lint",
+    "prebuild": "rimraf lib",
+    "build": "tsc",
+    "build:dev": "yarn build",
+    "postbuild": "ncp ./src/node/cli-protocol/ ./lib/node/cli-protocol/",
     "watch": "tsc -w",
-    "test": "mocha \"./lib/test/**/*.test.js\"",
-    "test:slow": "mocha \"./lib/test/**/*.slow-test.js\" --slow 5000",
-    "test:watch": "mocha --watch --watch-files lib \"./lib/test/**/*.test.js\""
+    "test": "cross-env IDE2_TEST=true mocha \"./lib/test/**/*.test.js\"",
+    "test:slow": "cross-env IDE2_TEST=true mocha \"./lib/test/**/*.slow-test.js\" --slow 5000"
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.6.7",
-    "@theia/application-package": "1.31.1",
-    "@theia/core": "1.31.1",
-    "@theia/debug": "1.31.1",
-    "@theia/editor": "1.31.1",
-    "@theia/electron": "1.31.1",
-    "@theia/filesystem": "1.31.1",
-    "@theia/keymaps": "1.31.1",
-    "@theia/markers": "1.31.1",
-    "@theia/messages": "1.31.1",
-    "@theia/monaco": "1.31.1",
-    "@theia/monaco-editor-core": "1.67.2",
-    "@theia/navigator": "1.31.1",
-    "@theia/outline-view": "1.31.1",
-    "@theia/output": "1.31.1",
-    "@theia/plugin-ext": "1.31.1",
-    "@theia/preferences": "1.31.1",
-    "@theia/scm": "1.31.1",
-    "@theia/search-in-workspace": "1.31.1",
-    "@theia/terminal": "1.31.1",
-    "@theia/typehierarchy": "1.31.1",
-    "@theia/workspace": "1.31.1",
+    "@grpc/grpc-js": "^1.8.14",
+    "@theia/application-package": "1.41.0",
+    "@theia/core": "1.41.0",
+    "@theia/debug": "1.41.0",
+    "@theia/editor": "1.41.0",
+    "@theia/electron": "1.41.0",
+    "@theia/filesystem": "1.41.0",
+    "@theia/keymaps": "1.41.0",
+    "@theia/markers": "1.41.0",
+    "@theia/messages": "1.41.0",
+    "@theia/monaco": "1.41.0",
+    "@theia/monaco-editor-core": "1.72.3",
+    "@theia/navigator": "1.41.0",
+    "@theia/outline-view": "1.41.0",
+    "@theia/output": "1.41.0",
+    "@theia/plugin-ext": "1.41.0",
+    "@theia/preferences": "1.41.0",
+    "@theia/scm": "1.41.0",
+    "@theia/search-in-workspace": "1.41.0",
+    "@theia/terminal": "1.41.0",
+    "@theia/typehierarchy": "1.41.0",
+    "@theia/workspace": "1.41.0",
     "@tippyjs/react": "^4.2.5",
-    "@types/auth0-js": "^9.14.0",
+    "@types/auth0-js": "^9.21.3",
     "@types/btoa": "^1.2.3",
     "@types/dateformat": "^3.0.1",
-    "@types/deepmerge": "^2.2.0",
-    "@types/glob": "^7.2.0",
     "@types/google-protobuf": "^3.7.2",
     "@types/js-yaml": "^3.12.2",
-    "@types/keytar": "^4.4.0",
+    "@types/jsdom": "^21.1.1",
     "@types/lodash.debounce": "^4.0.6",
     "@types/node-fetch": "^2.5.7",
     "@types/p-queue": "^2.3.1",
     "@types/ps-tree": "^1.1.0",
     "@types/react-tabs": "^2.3.2",
     "@types/temp": "^0.8.34",
-    "@types/which": "^1.3.1",
-    "@vscode/debugprotocol": "^1.51.0",
     "arduino-serial-plotter-webapp": "0.2.0",
     "async-mutex": "^0.3.0",
-    "auth0-js": "^9.14.0",
+    "auth0-js": "^9.23.2",
     "btoa": "^1.2.1",
     "classnames": "^2.3.1",
-    "cpy": "^8.1.2",
     "cross-fetch": "^3.1.5",
     "dateformat": "^3.0.3",
-    "deepmerge": "2.0.1",
+    "deepmerge": "^4.2.2",
+    "drivelist": "^9.2.4",
     "electron-updater": "^4.6.5",
+    "fast-deep-equal": "^3.1.3",
     "fast-json-stable-stringify": "^2.1.0",
     "fast-safe-stringify": "^2.1.1",
     "filename-reserved-regex": "^2.0.0",
     "glob": "^7.1.6",
     "google-protobuf": "^3.20.1",
     "hash.js": "^1.1.7",
-    "is-online": "^9.0.1",
+    "is-online": "^10.0.0",
     "js-yaml": "^3.13.1",
+    "jsdom": "^21.1.1",
     "jsonc-parser": "^2.2.0",
     "just-diff": "^5.1.1",
     "jwt-decode": "^3.1.2",
@@ -85,9 +85,11 @@
     "lodash.debounce": "^4.0.8",
     "minimatch": "^3.1.2",
     "node-fetch": "^2.6.1",
+    "node-log-rotate": "^0.1.5",
     "open": "^8.0.6",
     "p-debounce": "^2.1.0",
     "p-queue": "^2.4.2",
+    "process": "^0.11.10",
     "ps-tree": "^1.2.0",
     "query-string": "^7.0.1",
     "react-disable": "^0.1.1",
@@ -101,33 +103,31 @@
     "temp": "^0.9.1",
     "temp-dir": "^2.0.0",
     "tree-kill": "^1.2.1",
-    "which": "^1.3.1"
+    "util": "^0.12.5",
+    "vscode-arduino-api": "^0.1.2"
   },
   "devDependencies": {
     "@octokit/rest": "^18.12.0",
     "@types/chai": "^4.2.7",
-    "@types/chai-string": "^1.4.2",
-    "@types/mocha": "^5.2.7",
+    "@types/mocha": "^10.0.0",
     "@types/react-window": "^1.8.5",
+    "@xhmikosr/downloader": "^13.0.1",
     "chai": "^4.2.0",
-    "chai-string": "^1.5.0",
+    "cross-env": "^7.0.3",
     "decompress": "^4.2.0",
     "decompress-tarbz2": "^4.1.1",
     "decompress-targz": "^4.1.1",
     "decompress-unzip": "^4.0.1",
-    "download": "^7.1.0",
-    "grpc_tools_node_protoc_ts": "^4.1.0",
-    "mocha": "^7.0.0",
+    "grpc_tools_node_protoc_ts": "^5.3.3",
+    "mocha": "^10.2.0",
     "mockdate": "^3.0.5",
     "moment": "^2.24.0",
     "ncp": "^2.0.0",
-    "protoc": "^1.0.4",
-    "shelljs": "^0.8.3",
-    "uuid": "^3.2.1",
-    "yargs": "^11.1.0"
+    "rimraf": "^2.6.1"
   },
   "optionalDependencies": {
-    "grpc-tools": "^1.9.0"
+    "grpc-tools": "^1.12.4",
+    "protoc": "^1.0.4"
   },
   "mocha": {
     "require": [
@@ -147,6 +147,9 @@
     "examples"
   ],
   "theiaExtensions": [
+    {
+      "preload": "lib/electron-browser/preload"
+    },
     {
       "backend": "lib/node/arduino-ide-backend-module",
       "frontend": "lib/browser/arduino-ide-frontend-module"
@@ -157,26 +160,25 @@
     {
       "frontendElectron": "lib/electron-browser/theia/core/electron-window-module"
     },
+    {
+      "frontendElectron": "lib/electron-browser/electron-arduino-module"
+    },
     {
       "electronMain": "lib/electron-main/arduino-electron-main-module"
     }
   ],
   "arduino": {
-    "cli": {
-      "version": {
-        "owner": "arduino",
-        "repo": "arduino-cli",
-        "commitish": "71a8576"
-      }
+    "arduino-cli": {
+      "version": "0.35.2"
     },
-    "fwuploader": {
-      "version": "2.2.2"
+    "arduino-fwuploader": {
+      "version": "2.4.1"
+    },
+    "arduino-language-server": {
+      "version": "0.7.6"
     },
     "clangd": {
       "version": "14.0.0"
-    },
-    "languageServer": {
-      "version": "0.7.4"
     }
   }
 }

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

@@ -2,7 +2,6 @@
 
 (async () => {
   const path = require('path');
-  const shell = require('shelljs');
   const semver = require('semver');
   const moment = require('moment');
   const downloader = require('./downloader');
@@ -19,7 +18,7 @@
       return undefined;
     }
 
-    const { cli } = arduino;
+    const cli = arduino['arduino-cli'];
     if (!cli) {
       return undefined;
     }
@@ -29,14 +28,20 @@
   })();
 
   if (!version) {
-    shell.echo(`Could not retrieve CLI version info from the 'package.json'.`);
-    shell.exit(1);
+    console.log(`Could not retrieve CLI version info from the 'package.json'.`);
+    process.exit(1);
   }
 
   const { platform, arch } = process;
-  const buildFolder = path.join(__dirname, '..', 'build');
+  const resourcesFolder = path.join(
+    __dirname,
+    '..',
+    'src',
+    'node',
+    'resources'
+  );
   const cliName = `arduino-cli${platform === 'win32' ? '.exe' : ''}`;
-  const destinationPath = path.join(buildFolder, cliName);
+  const destinationPath = path.join(resourcesFolder, cliName);
 
   if (typeof version === 'string') {
     const suffix = (() => {
@@ -65,24 +70,24 @@
       }
     })();
     if (!suffix) {
-      shell.echo(`The CLI is not available for ${platform} ${arch}.`);
-      shell.exit(1);
+      console.log(`The CLI is not available for ${platform} ${arch}.`);
+      process.exit(1);
     }
     if (semver.valid(version)) {
       const url = `https://downloads.arduino.cc/arduino-cli/arduino-cli_${version}_${suffix}`;
-      shell.echo(
+      console.log(
         `📦  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(
+      console.log(
         `🌙  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);
+      console.log(`🔥  Could not interpret 'version': ${version}`);
+      process.exit(1);
     }
   } else {
     taskBuildFromGit(version, destinationPath, 'CLI');

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

@@ -1,38 +1,61 @@
 // @ts-check
 
 // The version to use.
-const version = '1.10.0';
+const version = '1.10.1';
 
 (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('node:os');
+  const {
+    existsSync,
+    promises: fs,
+    mkdirSync,
+    readdirSync,
+    cpSync,
+  } = require('node:fs');
+  const path = require('node:path');
+  const { exec } = require('./utils');
 
-  const repository = path.join(os.tmpdir(), `${v4()}-arduino-examples`);
-  if (shell.mkdir('-p', repository).code !== 0) {
-    shell.exit(1);
+  const destination = path.join(
+    __dirname,
+    '..',
+    'src',
+    'node',
+    'resources',
+    'Examples'
+  );
+  if (existsSync(destination)) {
+    console.log(
+      `Skipping Git checkout of the examples because the repository already exists: ${destination}`
+    );
+    return;
   }
 
-  if (
-    shell.exec(
-      `git clone https://github.com/arduino/arduino-examples.git ${repository}`
-    ).code !== 0
-  ) {
-    shell.exit(1);
-  }
+  const repository = await fs.mkdtemp(
+    path.join(os.tmpdir(), 'arduino-examples-')
+  );
 
-  if (
-    shell.exec(`git -C ${repository} checkout tags/${version} -b ${version}`)
-      .code !== 0
-  ) {
-    shell.exit(1);
-  }
+  exec(
+    'git',
+    ['clone', 'https://github.com/arduino/arduino-examples.git', repository],
+    { logStdout: true }
+  );
 
-  const destination = path.join(__dirname, '..', 'Examples');
-  shell.mkdir('-p', destination);
-  shell.cp('-fR', path.join(repository, 'examples', '*'), destination);
+  exec(
+    'git',
+    ['-C', repository, 'checkout', `tags/${version}`, '-b', version],
+    { logStdout: true }
+  );
+
+  mkdirSync(destination, { recursive: true });
+  const examplesPath = path.join(repository, 'examples');
+  const exampleResources = readdirSync(examplesPath);
+  for (const exampleResource of exampleResources) {
+    cpSync(
+      path.join(examplesPath, exampleResource),
+      path.join(destination, exampleResource),
+      { recursive: true }
+    );
+  }
 
   const isSketch = async (pathLike) => {
     try {
@@ -92,5 +115,5 @@ const version = '1.10.0';
     JSON.stringify(examples, null, 2),
     { encoding: 'utf8' }
   );
-  shell.echo(`Generated output to ${path.join(destination, 'examples.json')}`);
+  console.log(`Generated output to ${path.join(destination, 'examples.json')}`);
 })();

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

@@ -1,12 +1,10 @@
 // @ts-check
 
 (async () => {
-  const fs = require('fs');
-  const path = require('path');
-  const temp = require('temp');
-  const shell = require('shelljs');
+  const path = require('node:path');
   const semver = require('semver');
   const downloader = require('./downloader');
+  const { taskBuildFromGit } = require('./utils');
 
   const version = (() => {
     const pkg = require(path.join(__dirname, '..', 'package.json'));
@@ -19,7 +17,7 @@
       return undefined;
     }
 
-    const { fwuploader } = arduino;
+    const fwuploader = arduino['arduino-fwuploader'];
     if (!fwuploader) {
       return undefined;
     }
@@ -29,24 +27,37 @@
   })();
 
   if (!version) {
-    shell.echo(
+    console.log(
       `Could not retrieve Firmware Uploader version info from the 'package.json'.`
     );
-    shell.exit(1);
+    process.exit(1);
   }
 
   const { platform, arch } = process;
-  const buildFolder = path.join(__dirname, '..', 'build');
+  const resourcesFolder = path.join(
+    __dirname,
+    '..',
+    'src',
+    'node',
+    'resources'
+  );
   const fwuploderName = `arduino-fwuploader${
     platform === 'win32' ? '.exe' : ''
   }`;
-  const destinationPath = path.join(buildFolder, fwuploderName);
+  const destinationPath = path.join(resourcesFolder, fwuploderName);
 
   if (typeof version === 'string') {
     const suffix = (() => {
       switch (platform) {
         case 'darwin':
+          switch (arch) {
+            case 'arm64':
+              return 'macOS_ARM64.tar.gz';
+            case 'x64':
               return 'macOS_64bit.tar.gz';
+            default:
+              return undefined;
+          }
         case 'win32':
           return 'Windows_64bit.zip';
         case 'linux': {
@@ -66,14 +77,14 @@
       }
     })();
     if (!suffix) {
-      shell.echo(
+      console.log(
         `The Firmware Uploader is not available for ${platform} ${arch}.`
       );
-      shell.exit(1);
+      process.exit(1);
     }
     if (semver.valid(version)) {
       const url = `https://downloads.arduino.cc/arduino-fwuploader/arduino-fwuploader_${version}_${suffix}`;
-      shell.echo(
+      console.log(
         `📦  Identified released version of the Firmware Uploader. Downloading version ${version} from '${url}'`
       );
       await downloader.downloadUnzipFile(
@@ -82,85 +93,10 @@
         'arduino-fwuploader'
       );
     } else {
-      shell.echo(`🔥  Could not interpret 'version': ${version}`);
-      shell.exit(1);
+      console.log(`🔥  Could not interpret 'version': ${version}`);
+      process.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.');
+    taskBuildFromGit(version, destinationPath, 'Firmware Uploader');
   }
 })();

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

@@ -5,7 +5,6 @@
 
 (() => {
   const path = require('path');
-  const shell = require('shelljs');
   const downloader = require('./downloader');
   const { goBuildFromGit } = require('./utils');
 
@@ -16,7 +15,8 @@
     const { arduino } = pkg;
     if (!arduino) return [undefined, undefined];
 
-    const { languageServer, clangd } = arduino;
+    const { clangd } = arduino;
+    const languageServer = arduino['arduino-language-server'];
     if (!languageServer) return [undefined, undefined];
     if (!clangd) return [undefined, undefined];
 
@@ -24,20 +24,20 @@
   })();
 
   if (!DEFAULT_LS_VERSION) {
-    shell.echo(
+    console.log(
       `Could not retrieve Arduino Language Server version info from the 'package.json'.`
     );
-    shell.exit(1);
+    process.exit(1);
   }
 
   if (!DEFAULT_CLANGD_VERSION) {
-    shell.echo(
+    console.log(
       `Could not retrieve clangd version info from the 'package.json'.`
     );
-    shell.exit(1);
+    process.exit(1);
   }
 
-  const yargs = require('yargs')
+  const yargs = require('@theia/core/shared/yargs')
     .option('ls-version', {
       alias: 'lv',
       default: DEFAULT_LS_VERSION,
@@ -62,35 +62,50 @@
   const force = yargs['force-download'];
   const { platform, arch } = process;
   const platformArch = platform + '-' + arch;
-  const build = path.join(__dirname, '..', 'build');
+  const resourcesFolder = path.join(
+    __dirname,
+    '..',
+    'src',
+    'node',
+    'resources'
+  );
   const lsExecutablePath = path.join(
-    build,
+    resourcesFolder,
     `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');
+      clangdExecutablePath = path.join(resourcesFolder, 'clangd');
+      clangFormatExecutablePath = path.join(resourcesFolder, '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');
+      clangdExecutablePath = path.join(resourcesFolder, 'clangd');
+      clangFormatExecutablePath = path.join(resourcesFolder, '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');
+      clangdExecutablePath = path.join(resourcesFolder, 'clangd');
+      clangFormatExecutablePath = path.join(resourcesFolder, 'clang-format');
       lsSuffix = 'Linux_64bit.tar.gz';
       clangdSuffix = 'Linux_64bit';
       break;
+    case 'linux-arm64':
+      clangdExecutablePath = path.join(resourcesFolder, 'clangd');
+      clangFormatExecutablePath = path.join(resourcesFolder, 'clang-format');
+      lsSuffix = 'Linux_ARM64.tar.gz';
+      clangdSuffix = 'Linux_ARM64';
+      break;
     case 'win32-x64':
-      clangdExecutablePath = path.join(build, 'clangd.exe');
-      clangFormatExecutablePath = path.join(build, 'clang-format.exe');
+      clangdExecutablePath = path.join(resourcesFolder, 'clangd.exe');
+      clangFormatExecutablePath = path.join(
+        resourcesFolder,
+        'clang-format.exe'
+      );
       lsSuffix = 'Windows_64bit.zip';
       clangdSuffix = 'Windows_64bit';
       break;
@@ -98,10 +113,10 @@
       throw new Error(`Unsupported platform/arch: ${platformArch}.`);
   }
   if (!lsSuffix || !clangdSuffix) {
-    shell.echo(
+    console.log(
       `The arduino-language-server is not available for ${platform} ${arch}.`
     );
-    shell.exit(1);
+    process.exit(1);
   }
 
   if (typeof lsVersion === 'string') {
@@ -110,20 +125,31 @@
         ? 'nightly/arduino-language-server'
         : 'arduino-language-server_' + lsVersion
     }_${lsSuffix}`;
-    downloader.downloadUnzipAll(lsUrl, build, lsExecutablePath, force);
+    downloader.downloadUnzipAll(
+      lsUrl,
+      resourcesFolder,
+      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, {
+  downloader.downloadUnzipAll(
+    clangdUrl,
+    resourcesFolder,
+    clangdExecutablePath,
+    force,
+    {
       strip: 1,
-  }); // `strip`: the new clangd (12.x) is zipped into a folder, so we have to strip the outmost folder.
+    }
+  ); // `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,
+    resourcesFolder,
     clangFormatExecutablePath,
     force,
     {

arduino-ide-extension/scripts/downloader.js

@@ -1,21 +1,19 @@
+// @ts-check
+
 const fs = require('fs');
 const path = require('path');
-const shell = require('shelljs');
-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;
+process.on('unhandledRejection', (reason) => {
+  console.log(String(reason));
+  process.exit(1);
 });
 process.on('uncaughtException', (error) => {
-  shell.echo(String(error));
-  shell.exit(1);
-  throw error;
+  console.log(String(error));
+  process.exit(1);
 });
 
 /**
@@ -31,54 +29,42 @@ exports.downloadUnzipFile = async (
   force = false
 ) => {
   if (fs.existsSync(targetFile) && !force) {
-    shell.echo(`Skipping download because file already exists: ${targetFile}`);
+    console.log(`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);
-    }
-  }
+  fs.mkdirSync(path.dirname(targetFile), { recursive: true });
 
   const downloads = path.join(__dirname, '..', 'downloads');
-  if (shell.rm('-rf', targetFile, downloads).code !== 0) {
-    shell.exit(1);
-  }
+  fs.rmSync(targetFile, { recursive: true, force: true });
+  fs.rmSync(downloads, { recursive: true, force: true });
 
-  shell.echo(`>>> Downloading from '${url}'...`);
+  console.log(`>>> Downloading from '${url}'...`);
   const data = await download(url);
-  shell.echo(`<<< Download succeeded.`);
+  console.log(`<<< Download succeeded.`);
 
-  shell.echo('>>> Decompressing...');
+  console.log('>>> 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);
+    console.log('Error ocurred while decompressing the archive.');
+    process.exit(1);
   }
   const fileIndex = files.findIndex((f) => f.path.startsWith(filePrefix));
   if (fileIndex === -1) {
-    shell.echo(
+    console.log(
       `The downloaded artifact does not contain any file with prefix ${filePrefix}.`
     );
-    shell.exit(1);
+    process.exit(1);
   }
-  shell.echo('<<< Decompressing succeeded.');
+  console.log('<<< 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);
-  }
+  fs.renameSync(path.join(downloads, files[fileIndex].path), targetFile);
   if (!fs.existsSync(targetFile)) {
-    shell.echo(`Could not find file: ${targetFile}`);
-    shell.exit(1);
+    console.log(`Could not find file: ${targetFile}`);
+    process.exit(1);
   }
-  shell.echo(`Done: ${targetFile}`);
+  console.log(`Done: ${targetFile}`);
 };
 
 /**
@@ -86,7 +72,7 @@ exports.downloadUnzipFile = async (
  * @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}
+ * @param decompressOptions {import('decompress').DecompressOptions|undefined} [decompressOptions]
  */
 exports.downloadUnzipAll = async (
   url,
@@ -96,21 +82,16 @@ exports.downloadUnzipAll = async (
   decompressOptions = undefined
 ) => {
   if (fs.existsSync(targetFile) && !force) {
-    shell.echo(`Skipping download because file already exists: ${targetFile}`);
+    console.log(`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);
-    }
-  }
+  fs.mkdirSync(targetDir, { recursive: true });
 
-  shell.echo(`>>> Downloading from '${url}'...`);
+  console.log(`>>> Downloading from '${url}'...`);
   const data = await download(url);
-  shell.echo(`<<< Download succeeded.`);
+  console.log(`<<< Download succeeded.`);
 
-  shell.echo('>>> Decompressing...');
+  console.log('>>> Decompressing...');
   let options = {
     plugins: [unzip(), untargz(), untarbz2()],
   };
@@ -119,14 +100,27 @@ exports.downloadUnzipAll = async (
   }
   const files = await decompress(data, targetDir, options);
   if (files.length === 0) {
-    shell.echo('Error ocurred while decompressing the archive.');
-    shell.exit(1);
+    console.log('Error ocurred while decompressing the archive.');
+    process.exit(1);
   }
-  shell.echo('<<< Decompressing succeeded.');
+  console.log('<<< Decompressing succeeded.');
 
   if (!fs.existsSync(targetFile)) {
-    shell.echo(`Could not find file: ${targetFile}`);
-    shell.exit(1);
+    console.log(`Could not find file: ${targetFile}`);
+    process.exit(1);
   }
-  shell.echo(`Done: ${targetFile}`);
+  console.log(`Done: ${targetFile}`);
 };
+
+/**
+ * @param {string} url
+ * @returns {Promise<import('node:buffer').Buffer>}
+ */
+async function download(url) {
+  const { default: download } = await import('@xhmikosr/downloader');
+  /** @type {import('node:buffer').Buffer} */
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  const data = await download(url);
+  return data;
+}

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

@@ -1,75 +1,84 @@
 // @ts-check
 
 (async () => {
-
-    const os = require('os');
-    const path = require('path');
+  const os = require('node:os');
+  const path = require('node:path');
+  const { mkdirSync, promises: fs } = require('node:fs');
+  const { exec } = require('./utils');
   const glob = require('glob');
-    const { v4 } = require('uuid');
-    const shell = require('shelljs');
+  const { SemVer, gte, valid: validSemVer } = require('semver');
   const protoc = path.dirname(require('protoc/protoc'));
-    shell.env.PATH = `${shell.env.PATH}${path.delimiter}${protoc}`;
-    shell.env.PATH = `${shell.env.PATH}${path.delimiter}${path.join(__dirname, '..', 'node_modules', '.bin')}`;
 
-    const repository = path.join(os.tmpdir(), `${v4()}-arduino-cli`);
-    if (shell.mkdir('-p', repository).code !== 0) {
-        shell.exit(1);
-    }
+  const repository = await fs.mkdtemp(path.join(os.tmpdir(), 'arduino-cli-'));
 
   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);
+      console.log(`Could not parse the 'package.json'.`);
+      process.exit(1);
     }
 
+    const defaultVersion = {
+      owner: 'arduino',
+      repo: 'arduino-cli',
+      commitish: undefined,
+    };
     const { arduino } = pkg;
     if (!arduino) {
-            return { owner: 'arduino', repo: 'arduino-cli' };
+      return defaultVersion;
     }
 
-        const { cli } = arduino;
+    const cli = arduino['arduino-cli'];
     if (!cli) {
-            return { owner: 'arduino', repo: 'arduino-cli' };
+      return defaultVersion;
     }
 
     const { version } = cli;
     if (!version) {
-            return { owner: 'arduino', repo: 'arduino-cli' };
+      return defaultVersion;
     }
 
     if (typeof version === 'string') {
-            return { owner: 'arduino', repo: 'arduino-cli' };
+      return defaultVersion;
     }
 
     // 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);
+      console.log(`Could not retrieve 'owner' from ${JSON.stringify(version)}`);
+      process.exit(1);
     }
     if (!repo) {
-            shell.echo(`Could not retrieve 'repo' from ${JSON.stringify(version)}`);
-            shell.exit(1);
+      console.log(`Could not retrieve 'repo' from ${JSON.stringify(version)}`);
+      process.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.`);
+  console.log(`>>> Cloning repository from '${url}'...`);
+  exec('git', ['clone', url, repository], { logStdout: true });
+  console.log(`<<< Repository cloned.`);
 
   const { platform } = process;
-    const build = path.join(__dirname, '..', 'build');
-    const cli = path.join(build, `arduino-cli${platform === 'win32' ? '.exe' : ''}`);
-    const versionJson = shell.exec(`${cli} version --format json`).trim();
+  const resourcesFolder = path.join(
+    __dirname,
+    '..',
+    'src',
+    'node',
+    'resources'
+  );
+  const cli = path.join(
+    resourcesFolder,
+    `arduino-cli${platform === 'win32' ? '.exe' : ''}`
+  );
+  const versionJson = exec(cli, ['version', '--format', 'json'], {
+    logStdout: true,
+  }).trim();
   if (!versionJson) {
-        shell.echo(`Could not retrieve the CLI version from ${cli}.`);
-        shell.exit(1);
+    console.log(`Could not retrieve the CLI version from ${cli}.`);
+    process.exit(1);
   }
   // As of today (28.01.2021), the `VersionString` can be one of the followings:
   //  - `nightly-YYYYMMDD` stands for the nightly build, we use the , the `commitish` from the `package.json` to check out the code.
@@ -86,71 +95,99 @@
       }
       */
   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);
+  let version = versionObject.VersionString;
+  if (validSemVer(version)) {
+    // https://github.com/arduino/arduino-cli/pull/2374
+    if (gte(new SemVer(version, { loose: true }), new SemVer('0.35.0-rc.1'))) {
+      version = `v${version}`;
     }
-        shell.echo(`<<< Checked out tagged version: '${commitish}'.`);
+    console.log(`>>> Checking out tagged version: '${version}'...`);
+    exec('git', ['-C', repository, 'fetch', '--all', '--tags'], {
+      logStdout: true,
+    });
+    exec(
+      'git',
+      ['-C', repository, 'checkout', `tags/${version}`, '-b', version],
+      { logStdout: true }
+    );
+    console.log(`<<< Checked out tagged version: '${version}'.`);
   } 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}'.`);
+    console.log(
+      `>>> Checking out commitish from 'package.json': '${commitish}'...`
+    );
+    exec('git', ['-C', repository, 'checkout', commitish], { logStdout: true });
+    console.log(
+      `<<< 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}'.`);
+    console.log(
+      `>>> Checking out commitish from the CLI: '${versionObject.Commit}'...`
+    );
+    exec('git', ['-C', repository, 'checkout', versionObject.Commit], {
+      logStdout: true,
+    });
+    console.log(
+      `<<< Checked out commitish from the CLI: '${versionObject.Commit}'.`
+    );
   } else {
-        shell.echo(`WARN: no 'git checkout'. Generating from the HEAD revision.`);
+    console.log(`WARN: no 'git checkout'. Generating from the HEAD revision.`);
   }
 
-    shell.echo('>>> Generating TS/JS API from:');
-    if (shell.exec(`git -C ${repository} rev-parse --abbrev-ref HEAD`).code !== 0) {
-        shell.exit(1);
-    }
+  console.log('>>> Generating TS/JS API from:');
+  exec('git', ['-C', repository, 'rev-parse', '--abbrev-ref', 'HEAD'], {
+    logStdout: true,
+  });
 
   const rpc = path.join(repository, 'rpc');
   const out = path.join(__dirname, '..', 'src', 'node', 'cli-protocol');
-    shell.mkdir('-p', out);
+  mkdirSync(out, { recursive: true });
 
-    const protos = await new Promise(resolve =>
+  const protos = await new Promise((resolve) =>
     glob('**/*.proto', { cwd: rpc }, (error, matches) => {
       if (error) {
-                shell.echo(error.stack);
+        console.log(error.stack ?? error.message);
         resolve([]);
         return;
       }
-            resolve(matches.map(filename => path.join(rpc, filename)));
-        }));
+      resolve(matches.map((filename) => path.join(rpc, filename)));
+    })
+  );
   if (!protos || protos.length === 0) {
-        shell.echo(`Could not find any .proto files under ${rpc}.`);
-        shell.exit(1);
+    console.log(`Could not find any .proto files under ${rpc}.`);
+    process.exit(1);
   }
 
   // Generate JS code from the `.proto` files.
-    if (shell.exec(`grpc_tools_node_protoc \
---js_out=import_style=commonjs,binary:${out} \
---grpc_out=generate_package_definition:${out} \
--I ${rpc} \
-${protos.join(' ')}`).code !== 0) {
-        shell.exit(1);
-    }
+  exec(
+    'grpc_tools_node_protoc',
+    [
+      `--js_out=import_style=commonjs,binary:${out}`,
+      `--grpc_out=generate_package_definition:${out}`,
+      '-I',
+      rpc,
+      ...protos,
+    ],
+    { logStdout: true }
+  );
 
   // Generate the `.d.ts` files for JS.
-    if (shell.exec(`protoc \
---plugin=protoc-gen-ts=${path.resolve(__dirname, '..', 'node_modules', '.bin', `protoc-gen-ts${platform === 'win32' ? '.cmd' : ''}`)} \
---ts_out=generate_package_definition:${out} \
--I ${rpc} \
-${protos.join(' ')}`).code !== 0) {
-        shell.exit(1);
-    }
-
-    shell.echo('<<< Generation was successful.');
+  exec(
+    path.join(protoc, `protoc${platform === 'win32' ? '.exe' : ''}`),
+    [
+      `--plugin=protoc-gen-ts=${path.resolve(
+        __dirname,
+        '..',
+        'node_modules',
+        '.bin',
+        `protoc-gen-ts${platform === 'win32' ? '.cmd' : ''}`
+      )}`,
+      `--ts_out=generate_package_definition:${out}`,
+      '-I',
+      rpc,
+      ...protos,
+    ],
+    { logStdout: true }
+  );
 
+  console.log('<<< Generation was successful.');
 })();

arduino-ide-extension/scripts/utils.js

@@ -1,3 +1,28 @@
+// @ts-check
+
+const exec = (
+  /** @type {string} */ command,
+  /** @type {readonly string[]} */ args,
+  /** @type {Partial<import('node:child_process').ExecFileSyncOptionsWithStringEncoding> & { logStdout?: boolean }|undefined} */ options = undefined
+) => {
+  try {
+    const stdout = require('node:child_process').execFileSync(command, args, {
+      encoding: 'utf8',
+      ...(options ?? {}),
+    });
+    if (options?.logStdout) {
+      console.log(stdout.trim());
+    }
+    return stdout;
+  } catch (err) {
+    console.log(
+      `Failed to execute ${command} with args: ${JSON.stringify(args)}`
+    );
+    throw err;
+  }
+};
+exports.exec = exec;
+
 /**
  * Clones something from GitHub and builds it with [`Task`](https://taskfile.dev/).
  *
@@ -21,90 +46,98 @@ exports.goBuildFromGit = (version, destinationPath, taskName) => {
 };
 
 /**
- * The `command` is either `go` or `task`.
+ * The `command` must be either `'go'` or `'task'`.
+ * @param {string} command
+ * @param {{ owner: any; repo: any; commitish: any; }} version
+ * @param {string} destinationPath
+ * @param {string} taskName
  */
 function buildFromGit(command, version, destinationPath, taskName) {
-  const fs = require('fs');
-  const path = require('path');
+  const fs = require('node:fs');
+  const path = require('node:path');
   const temp = require('temp');
-  const shell = require('shelljs');
 
   // We assume an object with `owner`, `repo`, commitish?` properties.
   if (typeof version !== 'object') {
-    shell.echo(
+    console.log(
       `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);
+    console.log(`Could not retrieve 'owner' from ${JSON.stringify(version)}`);
+    process.exit(1);
   }
   if (!repo) {
-    shell.echo(`Could not retrieve 'repo' from ${JSON.stringify(version)}`);
-    shell.exit(1);
+    console.log(`Could not retrieve 'repo' from ${JSON.stringify(version)}`);
+    process.exit(1);
   }
   const url = `https://github.com/${owner}/${repo}.git`;
-  shell.echo(
+  console.log(
     `Building ${taskName} from ${url}. Commitish: ${
       commitish ? commitish : 'HEAD'
     }`
   );
 
   if (fs.existsSync(destinationPath)) {
-    shell.echo(
+    console.log(
       `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 resourcesFolder = path.join(
+    __dirname,
+    '..',
+    'src',
+    'node',
+    'resources'
+  );
+  fs.mkdirSync(resourcesFolder, { recursive: true });
 
   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.`);
+  console.log(`>>> Cloning ${taskName} source to ${tempRepoPath}...`);
+  exec('git', ['clone', url, tempRepoPath], { logStdout: true });
+  console.log(`<<< 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}.`);
+    console.log(`>>> Checking out ${commitish}...`);
+    exec('git', ['-C', tempRepoPath, 'checkout', commitish], {
+      logStdout: true,
+    });
+    console.log(`<<< 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.`);
+  exec('git', ['-C', tempRepoPath, 'rev-parse', '--short', 'HEAD'], {
+    logStdout: true,
+  });
+
+  console.log(`>>> Building the ${taskName}...`);
+  exec(command, ['build'], {
+    cwd: tempRepoPath,
+    encoding: 'utf8',
+    logStdout: true,
+  });
+  console.log(`<<< Done ${taskName} build.`);
 
   const binName = path.basename(destinationPath);
   if (!fs.existsSync(path.join(tempRepoPath, binName))) {
-    shell.echo(
+    console.log(
       `Could not find the ${taskName} at ${path.join(tempRepoPath, binName)}.`
     );
-    shell.exit(1);
+    process.exit(1);
   }
 
   const binPath = path.join(tempRepoPath, binName);
-  shell.echo(
+  console.log(
     `>>> Copying ${taskName} from ${binPath} to ${destinationPath}...`
   );
-  if (shell.cp(binPath, destinationPath).code !== 0) {
-    shell.exit(1);
-  }
-  shell.echo(`<<< Copied the ${taskName}.`);
+  fs.copyFileSync(binPath, destinationPath);
+  console.log(`<<< Copied the ${taskName}.`);
 
-  shell.echo(`<<< Verifying ${taskName}...`);
+  console.log(`<<< Verifying ${taskName}...`);
   if (!fs.existsSync(destinationPath)) {
-    shell.exit(1);
+    process.exit(1);
   }
-  shell.echo(`>>> Verified ${taskName}.`);
+  console.log(`>>> Verified ${taskName}.`);
 }

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

@@ -0,0 +1,16 @@
+import type { Disposable } from '@theia/core/lib/common/disposable';
+import type { AppInfo } from '../electron-common/electron-arduino';
+import type { StartupTasks } from '../electron-common/startup-task';
+import type { Sketch } from './contributions/contribution';
+
+export type { AppInfo };
+
+export const AppService = Symbol('AppService');
+export interface AppService {
+  quit(): void;
+  info(): Promise<AppInfo>;
+  registerStartupTasksHandler(
+    handler: (tasks: StartupTasks) => void
+  ): Disposable;
+  scheduleDeletion(sketch: Sketch): void; // TODO: find a better place
+}

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

@@ -1,41 +1,47 @@
-import * as remote from '@theia/core/electron-shared/@electron/remote';
+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 { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import {
+  TabBarToolbarContribution,
+  TabBarToolbarRegistry,
+} from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import {
+  ColorTheme,
+  CssStyleCollector,
+  StylingParticipant,
+} from '@theia/core/lib/browser/styling-service';
+import {
+  CommandContribution,
+  CommandRegistry,
+} from '@theia/core/lib/common/command';
+import {
+  MAIN_MENU_BAR,
+  MenuContribution,
+  MenuModelRegistry,
+} from '@theia/core/lib/common/menu';
+import { MessageService } from '@theia/core/lib/common/message-service';
+import { nls } from '@theia/core/lib/common/nls';
+import { isHighContrast } from '@theia/core/lib/common/theme';
+import { ElectronWindowPreferences } from '@theia/core/lib/electron-browser/window/electron-window-preferences';
 import {
   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 { 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 { 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 { EditorCommands, EditorMainMenu } from '@theia/editor/lib/browser';
+import React from '@theia/core/shared/react';
+import { EditorCommands } from '@theia/editor/lib/browser/editor-command';
+import { EditorMainMenu } from '@theia/editor/lib/browser/editor-menu';
 import { MonacoMenus } from '@theia/monaco/lib/browser/monaco-menu';
 import { FileNavigatorCommands } from '@theia/navigator/lib/browser/navigator-contribution';
 import { TerminalMenus } from '@theia/terminal/lib/browser/terminal-frontend-contribution';
-import { ElectronWindowPreferences } from '@theia/core/lib/electron-browser/window/electron-window-preferences';
 import { BoardsServiceProvider } from './boards/boards-service-provider';
 import { BoardsToolBarItem } from './boards/boards-toolbar-item';
 import { ArduinoMenus } from './menu/arduino-menus';
 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';
+import { ArduinoToolbar } from './toolbar/arduino-toolbar';
 
 @injectable()
 export class ArduinoFrontendContribution
@@ -44,7 +50,8 @@ export class ArduinoFrontendContribution
     TabBarToolbarContribution,
     CommandContribution,
     MenuContribution,
-    ColorContribution
+    ColorContribution,
+    StylingParticipant
 {
   @inject(MessageService)
   private readonly messageService: MessageService;
@@ -62,7 +69,7 @@ export class ArduinoFrontendContribution
   private readonly appStateService: FrontendApplicationStateService;
 
   @postConstruct()
-  protected async init(): Promise<void> {
+  protected init(): void {
     if (!window.navigator.onLine) {
       // tslint:disable-next-line:max-line-length
       this.messageService.warn(
@@ -80,8 +87,7 @@ export class ArduinoFrontendContribution
         switch (event.preferenceName) {
           case 'window.zoomLevel':
             if (typeof event.newValue === 'number') {
-              const webContents = remote.getCurrentWebContents();
-              webContents.setZoomLevel(event.newValue || 0);
+              window.electronTheiaCore.setZoomLevel(event.newValue || 0);
             }
             break;
         }
@@ -89,10 +95,9 @@ export class ArduinoFrontendContribution
     });
     this.appStateService.reachedState('ready').then(() =>
       this.electronWindowPreferences.ready.then(() => {
-        const webContents = remote.getCurrentWebContents();
         const zoomLevel =
           this.electronWindowPreferences.get('window.zoomLevel');
-        webContents.setZoomLevel(zoomLevel);
+        window.electronTheiaCore.setZoomLevel(zoomLevel);
       })
     );
   }
@@ -168,7 +173,8 @@ export class ArduinoFrontendContribution
         defaults: {
           dark: 'button.background',
           light: 'button.background',
-          hc: 'activityBar.inactiveForeground',
+          hcDark: 'activityBar.inactiveForeground',
+          hcLight: 'activityBar.inactiveForeground',
         },
         description:
           'Background color of the toolbar items. Such as Upload, Verify, etc.',
@@ -178,7 +184,8 @@ export class ArduinoFrontendContribution
         defaults: {
           dark: 'button.hoverBackground',
           light: 'button.hoverBackground',
-          hc: 'button.background',
+          hcDark: 'button.background',
+          hcLight: 'button.background',
         },
         description:
           'Background color of the toolbar items when hovering over them. Such as Upload, Verify, etc.',
@@ -188,7 +195,8 @@ export class ArduinoFrontendContribution
         defaults: {
           dark: 'secondaryButton.foreground',
           light: 'button.foreground',
-          hc: 'activityBar.inactiveForeground',
+          hcDark: 'activityBar.inactiveForeground',
+          hcLight: 'activityBar.inactiveForeground',
         },
         description:
           'Foreground color of the toolbar items. Such as Serial Monitor and Serial Plotter',
@@ -198,7 +206,8 @@ export class ArduinoFrontendContribution
         defaults: {
           dark: 'secondaryButton.hoverBackground',
           light: 'button.hoverBackground',
-          hc: 'textLink.foreground',
+          hcDark: 'textLink.foreground',
+          hcLight: 'textLink.foreground',
         },
         description:
           'Background color of the toolbar items when hovering over them, such as "Serial Monitor" and "Serial Plotter"',
@@ -208,7 +217,8 @@ export class ArduinoFrontendContribution
         defaults: {
           dark: 'editor.selectionBackground',
           light: 'editor.selectionBackground',
-          hc: 'textPreformat.foreground',
+          hcDark: 'textPreformat.foreground',
+          hcLight: 'textPreformat.foreground',
         },
         description:
           'Toggle color of the toolbar items when they are currently toggled (the command is in progress)',
@@ -218,37 +228,38 @@ export class ArduinoFrontendContribution
         defaults: {
           dark: 'dropdown.border',
           light: 'dropdown.border',
-          hc: 'dropdown.border',
+          hcDark: 'dropdown.border',
+          hcLight: 'dropdown.border',
         },
         description: 'Border color of the Board Selector.',
       },
-
       {
         id: 'arduino.toolbar.dropdown.borderActive',
         defaults: {
           dark: 'focusBorder',
           light: 'focusBorder',
-          hc: 'focusBorder',
+          hcDark: 'focusBorder',
+          hcLight: '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',
+          hcDark: 'dropdown.background',
+          hcLight: 'dropdown.background',
         },
         description: 'Background color of the Board Selector.',
       },
-
       {
         id: 'arduino.toolbar.dropdown.label',
         defaults: {
           dark: 'dropdown.foreground',
           light: 'dropdown.foreground',
-          hc: 'dropdown.foreground',
+          hcDark: 'dropdown.foreground',
+          hcLight: 'dropdown.foreground',
         },
         description: 'Font color of the Board Selector.',
       },
@@ -257,7 +268,8 @@ export class ArduinoFrontendContribution
         defaults: {
           dark: 'list.activeSelectionIconForeground',
           light: 'list.activeSelectionIconForeground',
-          hc: 'list.activeSelectionIconForeground',
+          hcDark: 'list.activeSelectionIconForeground',
+          hcLight: 'list.activeSelectionIconForeground',
         },
         description:
           'Color of the selected protocol icon in the Board Selector.',
@@ -267,7 +279,8 @@ export class ArduinoFrontendContribution
         defaults: {
           dark: 'list.hoverBackground',
           light: 'list.hoverBackground',
-          hc: 'list.hoverBackground',
+          hcDark: 'list.hoverBackground',
+          hcLight: 'list.hoverBackground',
         },
         description: 'Background color on hover of the Board Selector options.',
       },
@@ -276,11 +289,191 @@ export class ArduinoFrontendContribution
         defaults: {
           dark: 'list.activeSelectionBackground',
           light: 'list.activeSelectionBackground',
-          hc: 'list.activeSelectionBackground',
+          hcDark: 'list.activeSelectionBackground',
+          hcLight: 'list.activeSelectionBackground',
         },
         description:
           'Background color of the selected board in the Board Selector.',
       }
     );
   }
+
+  registerThemeStyle(theme: ColorTheme, collector: CssStyleCollector): void {
+    const warningForeground = theme.getColor('warningForeground');
+    const warningBackground = theme.getColor('warningBackground');
+    const focusBorder = theme.getColor('focusBorder');
+    const contrastBorder = theme.getColor('contrastBorder');
+    const notificationsBackground = theme.getColor('notifications.background');
+    const buttonBorder = theme.getColor('button.border');
+    const buttonBackground = theme.getColor('button.background') || 'none';
+    const dropdownBackground = theme.getColor('dropdown.background');
+    const arduinoToolbarButtonBackground = theme.getColor(
+      'arduino.toolbar.button.background'
+    );
+    if (isHighContrast(theme.type)) {
+      // toolbar items
+      collector.addRule(`
+        .p-TabBar-toolbar .item.arduino-tool-item.enabled:hover > div.toggle-serial-monitor,
+        .p-TabBar-toolbar .item.arduino-tool-item.enabled:hover > div.toggle-serial-plotter {
+          background: transparent;
+        }
+      `);
+      if (contrastBorder) {
+        collector.addRule(`
+          .quick-input-widget {
+            outline: 1px solid ${contrastBorder};
+            outline-offset: -1px;
+          }
+        `);
+      }
+      if (focusBorder) {
+        // customized react-select widget
+        collector.addRule(`
+          .arduino-select__option--is-selected {
+            outline: 1px solid ${focusBorder};
+          }
+        `);
+        collector.addRule(`
+          .arduino-select__option--is-focused {
+            outline: 1px dashed ${focusBorder};
+          }
+        `);
+        // boards selector dropdown
+        collector.addRule(`
+          #select-board-dialog .selectBoardContainer .list .item:hover {
+            outline: 1px dashed ${focusBorder};
+          }
+        `);
+        // button hover
+        collector.addRule(`
+          .theia-button:hover,
+          button.theia-button:hover {
+            outline: 1px dashed ${focusBorder};
+          }
+        `);
+        collector.addRule(`
+          .theia-button {
+            border: 1px solid ${focusBorder};
+          }
+        `);
+        collector.addRule(`
+          .component-list-item .header .installed-version:hover:before {
+            background-color: transparent;
+            outline: 1px dashed ${focusBorder};
+          }
+        `);
+        // tree node
+        collector.addRule(`
+          .theia-TreeNode:hover {
+            outline: 1px dashed ${focusBorder};
+          }
+        `);
+        collector.addRule(`
+          .quick-input-list .monaco-list-row.focused,
+          .theia-Tree .theia-TreeNode.theia-mod-selected {
+            outline: 1px dotted ${focusBorder};
+          }
+        `);
+        collector.addRule(`
+          div#select-board-dialog .selectBoardContainer .list .item.selected,
+          .theia-Tree:focus .theia-TreeNode.theia-mod-selected,
+          .theia-Tree .ReactVirtualized__List:focus .theia-TreeNode.theia-mod-selected {
+            outline: 1px solid ${focusBorder};
+          }
+        `);
+        // quick input
+        collector.addRule(`
+          .quick-input-list .monaco-list-row:hover {
+            outline: 1px dashed ${focusBorder};
+          }
+        `);
+        // editor tab-bar
+        collector.addRule(`
+          .p-TabBar.theia-app-centers .p-TabBar-tab.p-mod-closable > .p-TabBar-tabCloseIcon:hover {
+            outline: 1px dashed ${focusBorder};
+          }
+        `);
+        collector.addRule(`
+          #theia-main-content-panel .p-TabBar .p-TabBar-tab:hover {
+            outline: 1px dashed ${focusBorder};
+            outline-offset: -4px;
+          }
+        `);
+        collector.addRule(`
+          #theia-main-content-panel .p-TabBar .p-TabBar-tab.p-mod-current {
+            outline: 1px solid ${focusBorder};
+            outline-offset: -4px;
+          }
+        `);
+        // boards selector dropdown
+        collector.addRule(`
+          .arduino-boards-dropdown-item:hover {
+            outline: 1px dashed ${focusBorder};
+            outline-offset: -2px;
+          }
+        `);
+        if (notificationsBackground) {
+          // notification
+          collector.addRule(`
+            .theia-notification-list-item:hover:not(:focus) {
+              background-color: ${notificationsBackground};
+              outline: 1px dashed ${focusBorder};
+              outline-offset: -2px;
+            }
+          `);
+        }
+        if (arduinoToolbarButtonBackground) {
+          // toolbar item
+          collector.addRule(`
+            .item.arduino-tool-item.toggled .arduino-upload-sketch--toolbar,
+            .item.arduino-tool-item.toggled .arduino-verify-sketch--toolbar {
+              background-color: ${arduinoToolbarButtonBackground} !important;
+              outline: 1px solid ${focusBorder};
+            }
+          `);
+          collector.addRule(`
+            .p-TabBar-toolbar .item.arduino-tool-item.enabled:hover > div {
+              background: ${arduinoToolbarButtonBackground};
+              outline: 1px dashed ${focusBorder};
+            }
+          `);
+        }
+      }
+      if (dropdownBackground) {
+        // boards selector dropdown
+        collector.addRule(`
+          .arduino-boards-dropdown-item:hover {
+            background: ${dropdownBackground};
+          }
+        `);
+      }
+      if (warningForeground && warningBackground) {
+        // <input> widget with inverted foreground and background colors
+        collector.addRule(`
+          .theia-input.warning:focus,
+          .theia-input.warning::placeholder,
+          .theia-input.warning {
+            color: ${warningBackground};
+            background-color: ${warningForeground};
+          }
+        `);
+      }
+      if (buttonBorder) {
+        collector.addRule(`
+          button.theia-button,
+          button.theia-button.secondary,
+          .component-list-item .theia-button.secondary.no-border,
+          .component-list-item .theia-button.secondary.no-border:hover {
+            border: 1px solid ${buttonBorder};
+          }
+        `);
+        collector.addRule(`
+          .component-list-item .header .installed-version:before {
+            color: ${buttonBackground};
+            border: 1px solid ${buttonBorder};
+          }
+        `);
+      }
+    }
+  }
 }

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

@@ -27,7 +27,10 @@ import { SketchesServiceClientImpl } from './sketches-service-client-impl';
 import { CoreService, CoreServicePath } from '../common/protocol/core-service';
 import { BoardsListWidget } from './boards/boards-list-widget';
 import { BoardsListWidgetFrontendContribution } from './boards/boards-widget-frontend-contribution';
-import { BoardsServiceProvider } from './boards/boards-service-provider';
+import {
+  BoardListDumper,
+  BoardsServiceProvider,
+} from './boards/boards-service-provider';
 import { WorkspaceService as TheiaWorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import { WorkspaceService } from './theia/workspace/workspace-service';
 import { OutlineViewContribution as TheiaOutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution';
@@ -61,7 +64,6 @@ import {
   BoardsConfigDialog,
   BoardsConfigDialogProps,
 } from './boards/boards-config-dialog';
-import { BoardsConfigDialogWidget } from './boards/boards-config-dialog-widget';
 import { ScmContribution as TheiaScmContribution } from '@theia/scm/lib/browser/scm-contribution';
 import { ScmContribution } from './theia/scm/scm-contribution';
 import { SearchInWorkspaceFrontendContribution as TheiaSearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution';
@@ -100,7 +102,7 @@ import {
   FrontendConnectionStatusService as TheiaFrontendConnectionStatusService,
   ApplicationConnectionStatusContribution as TheiaApplicationConnectionStatusContribution,
 } from '@theia/core/lib/browser/connection-status-service';
-import { BoardsDataMenuUpdater } from './boards/boards-data-menu-updater';
+import { BoardsDataMenuUpdater } from './contributions/boards-data-menu-updater';
 import { BoardsDataStore } from './boards/boards-data-store';
 import { ILogger } from '@theia/core/lib/common/logger';
 import { bindContributionProvider } from '@theia/core/lib/common/contribution-provider';
@@ -178,7 +180,7 @@ import { TabBarRenderer } from './theia/core/tab-bars';
 import { EditorCommandContribution } from './theia/editor/editor-command';
 import { NavigatorTabBarDecorator as TheiaNavigatorTabBarDecorator } from '@theia/navigator/lib/browser/navigator-tab-bar-decorator';
 import { NavigatorTabBarDecorator } from './theia/navigator/navigator-tab-bar-decorator';
-import { Debug } from './contributions/debug';
+import { Debug, DebugDisabledStatusMessageSource } from './contributions/debug';
 import { Sketchbook } from './contributions/sketchbook';
 import { DebugFrontendApplicationContribution } from './theia/debug/debug-frontend-application-contribution';
 import { DebugFrontendApplicationContribution as TheiaDebugFrontendApplicationContribution } from '@theia/debug/lib/browser/debug-frontend-application-contribution';
@@ -208,7 +210,6 @@ import {
   MonacoEditorFactory,
   MonacoEditorProvider as TheiaMonacoEditorProvider,
 } from '@theia/monaco/lib/browser/monaco-editor-provider';
-import { StorageWrapper } from './storage-wrapper';
 import { NotificationManager } from './theia/messages/notifications-manager';
 import { NotificationManager as TheiaNotificationManager } from '@theia/messages/lib/browser/notifications-manager';
 import { NotificationsRenderer as TheiaNotificationsRenderer } from '@theia/messages/lib/browser/notifications-renderer';
@@ -238,7 +239,6 @@ import {
   UploadFirmwareDialog,
   UploadFirmwareDialogProps,
 } from './dialogs/firmware-uploader/firmware-uploader-dialog';
-
 import { UploadCertificate } from './contributions/upload-certificate';
 import {
   ArduinoFirmwareUploader,
@@ -271,8 +271,8 @@ import { MonitorModel } from './monitor-model';
 import { MonitorManagerProxyClientImpl } from './monitor-manager-proxy-client-impl';
 import { EditorManager as TheiaEditorManager } from '@theia/editor/lib/browser/editor-manager';
 import { EditorManager } from './theia/editor/editor-manager';
-import { HostedPluginEvents } from './hosted-plugin-events';
-import { HostedPluginSupport } from './theia/plugin-ext/hosted-plugin';
+import { HostedPluginEvents } from './hosted/hosted-plugin-events';
+import { HostedPluginSupportImpl } from './theia/plugin-ext/hosted-plugin';
 import { HostedPluginSupport as TheiaHostedPluginSupport } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin';
 import { Formatter, FormatterPath } from '../common/protocol/formatter';
 import { Format } from './contributions/format';
@@ -296,7 +296,7 @@ import { CoreErrorHandler } from './contributions/core-error-handler';
 import { CompilerErrors } from './contributions/compiler-errors';
 import { WidgetManager } from './theia/core/widget-manager';
 import { WidgetManager as TheiaWidgetManager } from '@theia/core/lib/browser/widget-manager';
-import { StartupTasks } from './contributions/startup-task';
+import { StartupTasksExecutor } from './contributions/startup-tasks-executor';
 import { IndexesUpdateProgress } from './contributions/indexes-update-progress';
 import { Daemon } from './contributions/daemon';
 import { FirstStartupInstaller } from './contributions/first-startup-installer';
@@ -328,9 +328,13 @@ import { NewCloudSketch } from './contributions/new-cloud-sketch';
 import { SketchbookCompositeWidget } from './widgets/sketchbook/sketchbook-composite-widget';
 import { WindowTitleUpdater } from './theia/core/window-title-updater';
 import { WindowTitleUpdater as TheiaWindowTitleUpdater } from '@theia/core/lib/browser/window/window-title-updater';
-import { ThemeServiceWithDB } from './theia/core/theming';
-import { ThemeServiceWithDB as TheiaThemeServiceWithDB } from '@theia/monaco/lib/browser/monaco-indexed-db';
-import { MonacoThemingService } from './theia/monaco/monaco-theming-service';
+import {
+  MonacoThemingService,
+  CleanupObsoleteThemes,
+  ThemesRegistrationSummary,
+  MonacoThemeRegistry,
+} from './theia/monaco/monaco-theming-service';
+import { MonacoThemeRegistry as TheiaMonacoThemeRegistry } from '@theia/monaco/lib/browser/textmate/monaco-theme-registry';
 import { MonacoThemingService as TheiaMonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-service';
 import { TypeHierarchyServiceProvider } from './theia/typehierarchy/type-hierarchy-service';
 import { TypeHierarchyServiceProvider as TheiaTypeHierarchyServiceProvider } from '@theia/typehierarchy/lib/browser/typehierarchy-service';
@@ -338,16 +342,6 @@ import { TypeHierarchyContribution } from './theia/typehierarchy/type-hierarchy-
 import { TypeHierarchyContribution as TheiaTypeHierarchyContribution } from '@theia/typehierarchy/lib/browser/typehierarchy-contribution';
 import { DefaultDebugSessionFactory } from './theia/debug/debug-session-contribution';
 import { DebugSessionFactory } from '@theia/debug/lib/browser/debug-session-contribution';
-import { DebugToolbar } from './theia/debug/debug-toolbar-widget';
-import { DebugToolBar as TheiaDebugToolbar } from '@theia/debug/lib/browser/view/debug-toolbar-widget';
-import { PluginMenuCommandAdapter } from './theia/plugin-ext/plugin-menu-command-adapter';
-import { PluginMenuCommandAdapter as TheiaPluginMenuCommandAdapter } from '@theia/plugin-ext/lib/main/browser/menus/plugin-menu-command-adapter';
-import { DebugSessionManager } from './theia/debug/debug-session-manager';
-import { DebugSessionManager as TheiaDebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
-import { DebugWidget } from '@theia/debug/lib/browser/view/debug-widget';
-import { DebugViewModel } from '@theia/debug/lib/browser/view/debug-view-model';
-import { DebugSessionWidget } from '@theia/debug/lib/browser/view/debug-session-widget';
-import { DebugConfigurationWidget } from '@theia/debug/lib/browser/view/debug-configuration-widget';
 import { ConfigServiceClient } from './config/config-service-client';
 import { ValidateSketch } from './contributions/validate-sketch';
 import { RenameCloudSketch } from './contributions/rename-cloud-sketch';
@@ -356,15 +350,48 @@ import { Account } from './contributions/account';
 import { SidebarBottomMenuWidget } from './theia/core/sidebar-bottom-menu-widget';
 import { SidebarBottomMenuWidget as TheiaSidebarBottomMenuWidget } from '@theia/core/lib/browser/shell/sidebar-bottom-menu-widget';
 import { CreateCloudCopy } from './contributions/create-cloud-copy';
+import { FileResourceResolver } from './theia/filesystem/file-resource';
+import { FileResourceResolver as TheiaFileResourceResolver } from '@theia/filesystem/lib/browser/file-resource';
+import { StylingParticipant } from '@theia/core/lib/browser/styling-service';
+import { MonacoEditorMenuContribution } from './theia/monaco/monaco-menu';
+import { MonacoEditorMenuContribution as TheiaMonacoEditorMenuContribution } from '@theia/monaco/lib/browser/monaco-menu';
+import { UpdateArduinoState } from './contributions/update-arduino-state';
+import { TerminalFrontendContribution } from './theia/terminal/terminal-frontend-contribution';
+import { TerminalFrontendContribution as TheiaTerminalFrontendContribution } from '@theia/terminal/lib/browser/terminal-frontend-contribution';
+import { SelectionService } from '@theia/core/lib/common/selection-service';
+import { CommandService } from '@theia/core/lib/common/command';
+import { CorePreferences } from '@theia/core/lib/browser/core-preferences';
+import { AutoSelectProgrammer } from './contributions/auto-select-programmer';
+import { HostedPluginSupport } from './hosted/hosted-plugin-support';
+import { DebugSessionManager as TheiaDebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
+import { DebugSessionManager } from './theia/debug/debug-session-manager';
+import { DebugWidget as TheiaDebugWidget } from '@theia/debug/lib/browser/view/debug-widget';
+import { DebugWidget } from './theia/debug/debug-widget';
+import { DebugViewModel } from '@theia/debug/lib/browser/view/debug-view-model';
+import { DebugSessionWidget } from '@theia/debug/lib/browser/view/debug-session-widget';
+import { DebugConfigurationWidget } from './theia/debug/debug-configuration-widget';
+import { DebugConfigurationWidget as TheiaDebugConfigurationWidget } from '@theia/debug/lib/browser/view/debug-configuration-widget';
+import { DebugToolBar } from '@theia/debug/lib/browser/view/debug-toolbar-widget';
+
+// Hack to fix copy/cut/paste issue after electron version update in Theia.
+// https://github.com/eclipse-theia/theia/issues/12487
+import('@theia/core/lib/browser/common-frontend-contribution.js').then(
+  (theiaCommonContribution) => {
+    theiaCommonContribution['supportCopy'] = true;
+    theiaCommonContribution['supportCut'] = true;
+    theiaCommonContribution['supportPaste'] = true;
+  }
+);
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
-  // Commands and toolbar items
+  // Commands, colors, theme adjustments, and toolbar items
   bind(ArduinoFrontendContribution).toSelf().inSingletonScope();
   bind(CommandContribution).toService(ArduinoFrontendContribution);
   bind(MenuContribution).toService(ArduinoFrontendContribution);
   bind(TabBarToolbarContribution).toService(ArduinoFrontendContribution);
   bind(FrontendApplicationContribution).toService(ArduinoFrontendContribution);
   bind(ColorContribution).toService(ArduinoFrontendContribution);
+  bind(StylingParticipant).toService(ArduinoFrontendContribution);
 
   bind(ArduinoToolbarContribution).toSelf().inSingletonScope();
   bind(FrontendApplicationContribution).toService(ArduinoToolbarContribution);
@@ -433,13 +460,14 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(BoardsServiceProvider).toSelf().inSingletonScope();
   bind(FrontendApplicationContribution).toService(BoardsServiceProvider);
   bind(CommandContribution).toService(BoardsServiceProvider);
+  bind(BoardListDumper).toSelf().inSingletonScope();
 
   // To be able to track, and update the menu based on the core settings (aka. board details) of the currently selected board.
-  bind(FrontendApplicationContribution)
-    .to(BoardsDataMenuUpdater)
-    .inSingletonScope();
   bind(BoardsDataStore).toSelf().inSingletonScope();
   bind(FrontendApplicationContribution).toService(BoardsDataStore);
+  bind(CommandContribution).toService(BoardsDataStore);
+  bind(StartupTaskProvider).toService(BoardsDataStore); // to inherit the boards config options, programmer, etc in a new window
+
   // Logger for the Arduino daemon
   bind(ILogger)
     .toDynamicValue((ctx) => {
@@ -466,7 +494,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(OpenHandler).toService(BoardsListWidgetFrontendContribution);
 
   // Board select dialog
-  bind(BoardsConfigDialogWidget).toSelf().inSingletonScope();
   bind(BoardsConfigDialog).toSelf().inSingletonScope();
   bind(BoardsConfigDialogProps).toConstantValue({
     title: nls.localize(
@@ -494,15 +521,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(TabBarToolbarContribution).toService(MonitorViewContribution);
   bind(WidgetFactory).toDynamicValue((context) => ({
     id: MonitorWidget.ID,
-    createWidget: () => {
-      return new MonitorWidget(
-        context.container.get<MonitorModel>(MonitorModel),
-        context.container.get<MonitorManagerProxyClient>(
-          MonitorManagerProxyClient
-        ),
-        context.container.get<BoardsServiceProvider>(BoardsServiceProvider)
-      );
-    },
+    createWidget: () => context.container.get(MonitorWidget),
   }));
 
   bind(MonitorManagerProxyFactory).toFactory(
@@ -725,7 +744,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, PlotterFrontendContribution);
   Contribution.configure(bind, Format);
   Contribution.configure(bind, CompilerErrors);
-  Contribution.configure(bind, StartupTasks);
+  Contribution.configure(bind, StartupTasksExecutor);
   Contribution.configure(bind, IndexesUpdateProgress);
   Contribution.configure(bind, Daemon);
   Contribution.configure(bind, FirstStartupInstaller);
@@ -746,10 +765,15 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, Account);
   Contribution.configure(bind, CloudSketchbookContribution);
   Contribution.configure(bind, CreateCloudCopy);
+  Contribution.configure(bind, UpdateArduinoState);
+  Contribution.configure(bind, BoardsDataMenuUpdater);
+  Contribution.configure(bind, AutoSelectProgrammer);
 
   bindContributionProvider(bind, StartupTaskProvider);
   bind(StartupTaskProvider).toService(BoardsServiceProvider); // to reuse the boards config in another window
 
+  bind(DebugDisabledStatusMessageSource).toService(Debug);
+
   // Disabled the quick-pick customization from Theia when multiple formatters are available.
   // Use the default VS Code behavior, and pick the first one. In the IDE2, clang-format has `exclusive` selectors.
   bind(MonacoFormattingConflictsContribution).toSelf().inSingletonScope();
@@ -792,10 +816,19 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     );
     const iconThemeService =
       context.container.get<IconThemeService>(IconThemeService);
+    const selectionService =
+      context.container.get<SelectionService>(SelectionService);
+    const commandService =
+      context.container.get<CommandService>(CommandService);
+    const corePreferences =
+      context.container.get<CorePreferences>(CorePreferences);
     return new TabBarRenderer(
       contextMenuRenderer,
       decoratorService,
-      iconThemeService
+      iconThemeService,
+      selectionService,
+      commandService,
+      corePreferences
     );
   });
 
@@ -838,6 +871,28 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   // To be able to use a `launch.json` from outside of the workspace.
   bind(DebugConfigurationManager).toSelf().inSingletonScope();
   rebind(TheiaDebugConfigurationManager).toService(DebugConfigurationManager);
+  // To update the currently selected debug config <select> option when starting a debug session.
+  bind(DebugSessionManager).toSelf().inSingletonScope();
+  rebind(TheiaDebugSessionManager).toService(DebugSessionManager);
+  // Customized debug widget with its customized config <select> to update it programmatically.
+  bind(WidgetFactory)
+    .toDynamicValue(({ container }) => ({
+      id: TheiaDebugWidget.ID,
+      createWidget: () => {
+        const child = new Container({ defaultScope: 'Singleton' });
+        child.parent = container;
+        child.bind(DebugViewModel).toSelf();
+        child.bind(DebugToolBar).toSelf();
+        child.bind(DebugSessionWidget).toSelf();
+        child.bind(DebugConfigurationWidget).toSelf(); // with the patched select
+        child // use the customized one in the Theia DI
+          .bind(TheiaDebugConfigurationWidget)
+          .toService(DebugConfigurationWidget);
+        child.bind(DebugWidget).toSelf();
+        return child.get(DebugWidget);
+      },
+    }))
+    .inSingletonScope();
 
   // To avoid duplicate tabs use deepEqual instead of string equal: https://github.com/eclipse-theia/theia/issues/11309
   bind(WidgetManager).toSelf().inSingletonScope();
@@ -874,9 +929,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     ),
   });
 
-  bind(StorageWrapper).toSelf().inSingletonScope();
-  bind(CommandContribution).toService(StorageWrapper);
-
   bind(NotificationManager).toSelf().inSingletonScope();
   rebind(TheiaNotificationManager).toService(NotificationManager);
   bind(NotificationsRenderer).toSelf().inSingletonScope();
@@ -969,8 +1021,9 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     })
     .inSingletonScope();
 
-  bind(HostedPluginSupport).toSelf().inSingletonScope();
-  rebind(TheiaHostedPluginSupport).toService(HostedPluginSupport);
+  bind(HostedPluginSupportImpl).toSelf().inSingletonScope();
+  bind(HostedPluginSupport).toService(HostedPluginSupportImpl);
+  rebind(TheiaHostedPluginSupport).toService(HostedPluginSupportImpl);
   bind(HostedPluginEvents).toSelf().inSingletonScope();
   bind(FrontendApplicationContribution).toService(HostedPluginEvents);
 
@@ -979,11 +1032,17 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   rebind(TheiaWindowTitleUpdater).toService(WindowTitleUpdater);
 
   // register Arduino themes
-  bind(ThemeServiceWithDB).toSelf().inSingletonScope();
-  rebind(TheiaThemeServiceWithDB).toService(ThemeServiceWithDB);
   bind(MonacoThemingService).toSelf().inSingletonScope();
   rebind(TheiaMonacoThemingService).toService(MonacoThemingService);
 
+  // workaround for themes cannot be removed after registration
+  // https://github.com/eclipse-theia/theia/issues/11151
+  bind(CleanupObsoleteThemes).toSelf().inSingletonScope();
+  bind(FrontendApplicationContribution).toService(CleanupObsoleteThemes);
+  bind(ThemesRegistrationSummary).toSelf().inSingletonScope();
+  bind(MonacoThemeRegistry).toSelf().inSingletonScope();
+  rebind(TheiaMonacoThemeRegistry).toService(MonacoThemeRegistry);
+
   // disable type-hierarchy support
   // https://github.com/eclipse-theia/theia/commit/16c88a584bac37f5cf3cc5eb92ffdaa541bda5be
   bind(TypeHierarchyServiceProvider).toSelf().inSingletonScope();
@@ -993,37 +1052,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(TypeHierarchyContribution).toSelf().inSingletonScope();
   rebind(TheiaTypeHierarchyContribution).toService(TypeHierarchyContribution);
 
-  // patched the debugger for `cortex-debug@1.5.1`
-  // https://github.com/eclipse-theia/theia/issues/11871
-  // https://github.com/eclipse-theia/theia/issues/11879
-  // https://github.com/eclipse-theia/theia/issues/11880
-  // https://github.com/eclipse-theia/theia/issues/11885
-  // https://github.com/eclipse-theia/theia/issues/11886
-  // https://github.com/eclipse-theia/theia/issues/11916
-  // based on: https://github.com/eclipse-theia/theia/compare/master...kittaakos:theia:%2311871
   bind(DefaultDebugSessionFactory).toSelf().inSingletonScope();
   rebind(DebugSessionFactory).toService(DefaultDebugSessionFactory);
-  bind(DebugSessionManager).toSelf().inSingletonScope();
-  rebind(TheiaDebugSessionManager).toService(DebugSessionManager);
-  bind(DebugToolbar).toSelf().inSingletonScope();
-  rebind(TheiaDebugToolbar).toService(DebugToolbar);
-  bind(PluginMenuCommandAdapter).toSelf().inSingletonScope();
-  rebind(TheiaPluginMenuCommandAdapter).toService(PluginMenuCommandAdapter);
-  bind(WidgetFactory)
-    .toDynamicValue(({ container }) => ({
-      id: DebugWidget.ID,
-      createWidget: () => {
-        const child = new Container({ defaultScope: 'Singleton' });
-        child.parent = container;
-        child.bind(DebugViewModel).toSelf();
-        child.bind(DebugToolbar).toSelf(); // patched toolbar
-        child.bind(DebugSessionWidget).toSelf();
-        child.bind(DebugConfigurationWidget).toSelf();
-        child.bind(DebugWidget).toSelf();
-        return child.get(DebugWidget);
-      },
-    }))
-    .inSingletonScope();
 
   bind(SidebarBottomMenuWidget).toSelf();
   rebind(TheiaSidebarBottomMenuWidget).toService(SidebarBottomMenuWidget);
@@ -1034,4 +1064,22 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(FrontendApplicationContribution).toService(DaemonPort);
   bind(IsOnline).toSelf().inSingletonScope();
   bind(FrontendApplicationContribution).toService(IsOnline);
+
+  // https://github.com/arduino/arduino-ide/issues/437
+  bind(FileResourceResolver).toSelf().inSingletonScope();
+  rebind(TheiaFileResourceResolver).toService(FileResourceResolver);
+
+  // Full control over the editor context menu to filter undesired menu items contributed by Theia.
+  // https://github.com/arduino/arduino-ide/issues/1394
+  // https://github.com/arduino/arduino-ide/pull/2027#pullrequestreview-1414246614
+  bind(MonacoEditorMenuContribution).toSelf().inSingletonScope();
+  rebind(TheiaMonacoEditorMenuContribution).toService(
+    MonacoEditorMenuContribution
+  );
+
+  // Patch terminal issues.
+  bind(TerminalFrontendContribution).toSelf().inSingletonScope();
+  rebind(TheiaTerminalFrontendContribution).toService(
+    TerminalFrontendContribution
+  );
 });

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

@@ -1,12 +1,15 @@
-import { interfaces } from '@theia/core/shared/inversify';
 import {
-  createPreferenceProxy,
-  PreferenceProxy,
-  PreferenceService,
   PreferenceContribution,
+  PreferenceProxy,
   PreferenceSchema,
+  PreferenceService,
+  createPreferenceProxy,
 } from '@theia/core/lib/browser/preferences';
-import { nls } from '@theia/core/lib/common';
+import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
+import { nls } from '@theia/core/lib/common/nls';
+import { PreferenceSchemaProperty } from '@theia/core/lib/common/preferences/preference-schema';
+import { interfaces } from '@theia/core/shared/inversify';
+import { serialMonitorWidgetLabel } from '../common/nls';
 import { CompilerWarningLiterals, CompilerWarnings } from '../common/protocol';
 
 export enum UpdateChannel {
@@ -31,7 +34,7 @@ export const ErrorRevealStrategyLiterals = [
    */
   'centerIfOutsideViewport',
 ] as const;
-export type ErrorRevealStrategy = typeof ErrorRevealStrategyLiterals[number];
+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 {
@@ -40,9 +43,30 @@ export namespace ErrorRevealStrategy {
   export const Default: ErrorRevealStrategy = 'centerIfOutsideViewport';
 }
 
-export const ArduinoConfigSchema: PreferenceSchema = {
-  type: 'object',
-  properties: {
+export type MonitorWidgetDockPanel = Extract<
+  ApplicationShell.Area,
+  'bottom' | 'right'
+>;
+export const defaultMonitorWidgetDockPanel: MonitorWidgetDockPanel = 'bottom';
+export function isMonitorWidgetDockPanel(
+  arg: unknown
+): arg is MonitorWidgetDockPanel {
+  return arg === 'bottom' || arg === 'right';
+}
+
+export const defaultAsyncWorkers = 0 as const;
+export const minAsyncWorkers = defaultAsyncWorkers;
+export const maxAsyncWorkers = 8 as const;
+
+type StrictPreferenceSchemaProperties<T extends object> = {
+  [p in keyof T]: PreferenceSchemaProperty;
+};
+type ArduinoPreferenceSchemaProperties =
+  StrictPreferenceSchemaProperties<ArduinoConfiguration> & {
+    'arduino.window.zoomLevel': PreferenceSchemaProperty;
+  };
+
+const properties: ArduinoPreferenceSchemaProperties = {
   'arduino.language.log': {
     type: 'boolean',
     description: nls.localize(
@@ -59,6 +83,16 @@ export const ArduinoConfigSchema: PreferenceSchema = {
     ),
     default: false,
   },
+  'arduino.language.asyncWorkers': {
+    type: 'number',
+    description: nls.localize(
+      'arduino/preferences/language.asyncWorkers',
+      'Number of async workers used by the Arduino Language Server (clangd). Background index also uses this many workers. The minimum value is 0, and the maximum is 8. When it is 0, the language server uses all available cores. The default value is 0.'
+    ),
+    minimum: minAsyncWorkers,
+    maximum: maxAsyncWorkers,
+    default: defaultAsyncWorkers,
+  },
   'arduino.compile.verbose': {
     type: 'boolean',
     description: nls.localize(
@@ -258,12 +292,27 @@ export const ArduinoConfigSchema: PreferenceSchema = {
     ),
     default: undefined,
   },
+  'arduino.monitor.dockPanel': {
+    type: 'string',
+    enum: ['bottom', 'right'],
+    markdownDescription: nls.localize(
+      'arduino/preferences/monitor/dockPanel',
+      'The area of the application shell where the _{0}_ widget will reside. It is either "bottom" or "right". It defaults to "{1}".',
+      serialMonitorWidgetLabel,
+      defaultMonitorWidgetDockPanel
+    ),
+    default: defaultMonitorWidgetDockPanel,
   },
 };
+export const ArduinoConfigSchema: PreferenceSchema = {
+  type: 'object',
+  properties,
+};
 
 export interface ArduinoConfiguration {
   'arduino.language.log': boolean;
   'arduino.language.realTimeDiagnostics': boolean;
+  'arduino.language.asyncWorkers': number;
   'arduino.compile.verbose': boolean;
   'arduino.compile.experimental': boolean;
   'arduino.compile.revealRange': ErrorRevealStrategy;
@@ -288,6 +337,7 @@ export interface ArduinoConfiguration {
   'arduino.cli.daemon.debug': boolean;
   'arduino.sketch.inoBlueprint': string;
   'arduino.checkForUpdates': boolean;
+  'arduino.monitor.dockPanel': MonitorWidgetDockPanel;
 }
 
 export const ArduinoPreferences = Symbol('ArduinoPreferences');

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

@@ -9,13 +9,13 @@ import {
   CommandContribution,
 } from '@theia/core/lib/common/command';
 import {
+  AuthOptions,
   AuthenticationService,
   AuthenticationServiceClient,
   AuthenticationSession,
+  authServerPort,
 } 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()
@@ -61,7 +61,7 @@ export class AuthenticationClientService
 
   setOptions(): Promise<void> {
     return this.service.setOptions({
-      redirectUri: `http://localhost:${serverPort}/callback`,
+      redirectUri: `http://localhost:${authServerPort}/callback`,
       responseType: 'code',
       clientID: this.arduinoPreferences['arduino.auth.clientID'],
       domain: this.arduinoPreferences['arduino.auth.domain'],

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

@@ -1,243 +1,201 @@
-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,
-  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 { nls } from '@theia/core/lib/common';
-import { NotificationCenter } from '../notification-center';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { MessageService } from '@theia/core/lib/common/message-service';
+import { MessageType } from '@theia/core/lib/common/message-service-protocol';
+import { nls } from '@theia/core/lib/common/nls';
+import { notEmpty } from '@theia/core/lib/common/objects';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { NotificationManager } from '@theia/messages/lib/browser/notifications-manager';
 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[];
+import { Installable, ResponseServiceClient } from '../../common/protocol';
+import {
+  BoardIdentifier,
+  BoardsPackage,
+  BoardsService,
+  createPlatformIdentifier,
+  isBoardIdentifierChangeEvent,
+  PlatformIdentifier,
+  platformIdentifierEquals,
+  serializePlatformIdentifier,
+} from '../../common/protocol/boards-service';
+import { NotificationCenter } from '../notification-center';
+import { BoardsServiceProvider } from './boards-service-provider';
+import { BoardsListWidgetFrontendContribution } from './boards-widget-frontend-contribution';
 
 /**
- * Listens on `BoardsConfig.Config` changes, if a board is selected which does not
+ * Listens on `BoardsConfigChangeEvent`s, 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;
-
+  private readonly messageService: MessageService;
+  @inject(NotificationManager)
+  private readonly notificationManager: NotificationManager;
   @inject(BoardsService)
-  protected readonly boardsService: BoardsService;
-
+  private readonly boardsService: BoardsService;
   @inject(BoardsServiceProvider)
-  protected readonly boardsServiceClient: BoardsServiceProvider;
-
+  private readonly boardsServiceProvider: BoardsServiceProvider;
   @inject(ResponseServiceClient)
-  protected readonly responseService: ResponseServiceClient;
-
+  private readonly responseService: ResponseServiceClient;
   @inject(BoardsListWidgetFrontendContribution)
-  protected readonly boardsManagerFrontendContribution: BoardsListWidgetFrontendContribution;
+  private readonly boardsManagerWidgetContribution: BoardsListWidgetFrontendContribution;
 
   // 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;
+  private readonly installNotificationInfos: Readonly<{
+    boardName: string;
+    platformId: string;
+    notificationId: string;
+  }>[] = [];
+  private readonly toDispose = new DisposableCollection();
 
   onStart(): void {
-    const setEventListeners = () => {
-      this.boardsServiceClient.onBoardsConfigChanged((config) => {
-        const { selectedBoard, selectedPort } = config;
+    this.toDispose.pushAll([
+      this.boardsServiceProvider.onBoardsConfigDidChange((event) => {
+        if (isBoardIdentifierChangeEvent(event)) {
+          this.ensureCoreExists(event.selectedBoard);
+        }
+      }),
+      this.notificationCenter.onPlatformDidInstall((event) =>
+        this.clearAllNotificationForPlatform(event.item.id)
+      ),
+    ]);
+    this.boardsServiceProvider.ready.then(() => {
+      const { selectedBoard } = this.boardsServiceProvider.boardsConfig;
+      this.ensureCoreExists(selectedBoard);
+    });
+  }
 
-        const boardWasUnplugged =
-          !selectedPort && this.portSelectedOnLastRefusal;
-
-        this.clearLastRefusedPromptInfo();
+  private async findPlatformToInstall(
+    selectedBoard: BoardIdentifier
+  ): Promise<BoardsPackage | undefined> {
+    const platformId = await this.findPlatformIdToInstall(selectedBoard);
+    if (!platformId) {
+      return undefined;
+    }
+    const id = serializePlatformIdentifier(platformId);
+    const platform = await this.boardsService.getBoardPackage({ id });
+    if (!platform) {
+      console.warn(`Could not resolve platform for ID: ${id}`);
+      return undefined;
+    }
+    if (platform.installedVersion) {
+      return undefined;
+    }
+    return platform;
+  }
 
+  private async findPlatformIdToInstall(
+    selectedBoard: BoardIdentifier
+  ): Promise<PlatformIdentifier | undefined> {
+    const selectedBoardPlatformId = createPlatformIdentifier(selectedBoard);
+    // The board is installed or the FQBN is available from the `board list watch` for Arduino boards. The latter might change!
+    if (selectedBoardPlatformId) {
+      const installedPlatforms =
+        await this.boardsService.getInstalledPlatforms();
+      const installedPlatformIds = installedPlatforms
+        .map((platform) => createPlatformIdentifier(platform.id))
+        .filter(notEmpty);
       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)
+        installedPlatformIds.every(
+          (installedPlatformId) =>
+            !platformIdentifierEquals(
+              installedPlatformId,
+              selectedBoardPlatformId
             )
-    );
+        )
+      ) {
+        return selectedBoardPlatformId;
       }
-
-  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);
+      // IDE2 knows that selected board is not installed. Look for board `name` match in not yet installed platforms.
+      // The order should be correct when there is a board name collision (e.g. Arduino Nano RP2040 from Arduino Mbed OS Nano Boards, [DEPRECATED] Arduino Mbed OS Nano Boards). The CLI boosts the platforms, so picking the first name match should be fine.
+      const platforms = await this.boardsService.search({});
+      for (const platform of platforms) {
+        // Ignore installed platforms
+        if (platform.installedVersion) {
+          continue;
         }
-    });
+        if (
+          platform.boards.some((board) => board.name === selectedBoard.name)
+        ) {
+          const platformId = createPlatformIdentifier(platform.id);
+          if (platformId) {
+            return platformId;
+          }
+        }
+      }
+    }
+    return undefined;
   }
 
-  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)) {
+  private async ensureCoreExists(
+    selectedBoard: BoardIdentifier | undefined
+  ): Promise<void> {
+    if (!selectedBoard) {
       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(
-      ({ installedVersion }) => !installedVersion
-    );
-
-    return candidates[0];
+    const candidate = await this.findPlatformToInstall(selectedBoard);
+    if (!candidate) {
+      return;
     }
+    const platformIdToInstall = candidate.id;
+    const selectedBoardName = selectedBoard.name;
+    if (
+      this.installNotificationInfos.some(
+        ({ boardName, platformId }) =>
+          platformIdToInstall === platformId && selectedBoardName === boardName
+      )
+    ) {
+      // Already has a notification for the board with the same platform. Nothing to do.
+      return;
+    }
+    this.clearAllNotificationForPlatform(platformIdToInstall);
 
-  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,
+    const yes = nls.localize('vscode/extensionsUtils/yes', 'Yes');
+    const message = 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?',
+      candidate.name,
       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
+    const notificationId = this.notificationId(message, InstallManually, yes);
+    this.installNotificationInfos.push({
+      boardName: selectedBoardName,
+      platformId: platformIdToInstall,
+      notificationId,
+    });
+    const answer = await this.messageService.info(
+      message,
+      InstallManually,
+      yes
     );
+    if (answer) {
+      const index = this.installNotificationInfos.findIndex(
+        ({ boardName, platformId }) =>
+          platformIdToInstall === platformId && selectedBoardName === boardName
+      );
+      if (index !== -1) {
+        this.installNotificationInfos.splice(index, 1);
       }
-
-  private createPromptActions(
-    candidate: BoardsPackage
-  ): AutoInstallPromptActions {
-    const yes = nls.localize('vscode/extensionsUtils/yes', 'Yes');
-
-    const actions: AutoInstallPromptActions = [
-      {
-        key: InstallManually,
-        handler: () => {
-          this.boardsManagerFrontendContribution
+      if (answer === yes) {
+        await Installable.installWithProgress({
+          installable: this.boardsService,
+          item: candidate,
+          messageService: this.messageService,
+          responseService: this.responseService,
+          version: candidate.availableVersions[0],
+        });
+        return;
+      }
+      if (answer === InstallManually) {
+        this.boardsManagerWidgetContribution
           .openView({ reveal: true })
           .then((widget) =>
             widget.refresh({
@@ -245,37 +203,27 @@ export class BoardsAutoInstaller implements FrontendApplicationContribution {
               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],
+      }
+    }
+  }
+
+  private clearAllNotificationForPlatform(predicatePlatformId: string): void {
+    // Discard all install notifications for the same platform.
+    const notificationsLength = this.installNotificationInfos.length;
+    for (let i = notificationsLength - 1; i >= 0; i--) {
+      const { notificationId, platformId } = this.installNotificationInfos[i];
+      if (platformId === predicatePlatformId) {
+        this.installNotificationInfos.splice(i, 1);
+        this.notificationManager.clear(notificationId);
+      }
+    }
+  }
+
+  private notificationId(message: string, ...actions: string[]): string {
+    return this.notificationManager['getMessageId']({
+      text: message,
+      actions,
+      type: MessageType.Info,
     });
-        },
-      },
-    ];
-
-    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-component.tsx

@@ -0,0 +1,345 @@
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { Event } from '@theia/core/lib/common/event';
+import { FrontendApplicationState } from '@theia/core/lib/common/frontend-application-state';
+import { nls } from '@theia/core/lib/common/nls';
+import React from '@theia/core/shared/react';
+import { EditBoardsConfigActionParams } from '../../common/protocol/board-list';
+import {
+  Board,
+  BoardIdentifier,
+  BoardWithPackage,
+  DetectedPort,
+  findMatchingPortIndex,
+  Port,
+  PortIdentifier,
+} from '../../common/protocol/boards-service';
+import type { Defined } from '../../common/types';
+import { NotificationCenter } from '../notification-center';
+import { BoardsConfigDialogState } from './boards-config-dialog';
+
+namespace BoardsConfigComponent {
+  export interface Props {
+    /**
+     * This is not the real config, it's only living in the dialog. Users can change it without update and can cancel any modifications.
+     */
+    readonly boardsConfig: BoardsConfigDialogState;
+    readonly searchSet: BoardIdentifier[] | undefined;
+    readonly notificationCenter: NotificationCenter;
+    readonly appState: FrontendApplicationState;
+    readonly onFocusNodeSet: (element: HTMLElement | undefined) => void;
+    readonly onFilteredTextDidChangeEvent: Event<
+      Defined<EditBoardsConfigActionParams['query']>
+    >;
+    readonly onAppStateDidChange: Event<FrontendApplicationState>;
+    readonly onBoardSelected: (board: BoardIdentifier) => void;
+    readonly onPortSelected: (port: PortIdentifier) => void;
+    readonly searchBoards: (query?: {
+      query?: string;
+    }) => Promise<BoardWithPackage[]>;
+    readonly ports: (
+      predicate?: (port: DetectedPort) => boolean
+    ) => readonly DetectedPort[];
+  }
+
+  export interface State {
+    searchResults: Array<BoardWithPackage>;
+    showAllPorts: boolean;
+    query: string;
+  }
+}
+
+class Item<T> extends React.Component<{
+  item: T;
+  label: string;
+  selected: boolean;
+  onClick: (item: T) => void;
+  missing?: boolean;
+  details?: string;
+  title?: string | ((item: T) => string);
+}> {
+  override render(): React.ReactNode {
+    const { selected, label, missing, details, item } = this.props;
+    const classNames = ['item'];
+    if (selected) {
+      classNames.push('selected');
+    }
+    if (missing === true) {
+      classNames.push('missing');
+    }
+    let title = this.props.title ?? `${label}${!details ? '' : details}`;
+    if (typeof title === 'function') {
+      title = title(item);
+    }
+    return (
+      <div
+        onClick={this.onClick}
+        className={classNames.join(' ')}
+        title={title}
+      >
+        <div className="label">{label}</div>
+        {!details ? '' : <div className="details">{details}</div>}
+        {!selected ? (
+          ''
+        ) : (
+          <div className="selected-icon">
+            <i className="fa fa-check" />
+          </div>
+        )}
+      </div>
+    );
+  }
+
+  private readonly onClick = () => {
+    this.props.onClick(this.props.item);
+  };
+}
+
+export class BoardsConfigComponent extends React.Component<
+  BoardsConfigComponent.Props,
+  BoardsConfigComponent.State
+> {
+  private readonly toDispose: DisposableCollection;
+
+  constructor(props: BoardsConfigComponent.Props) {
+    super(props);
+    this.state = {
+      searchResults: [],
+      showAllPorts: false,
+      query: '',
+    };
+    this.toDispose = new DisposableCollection();
+  }
+
+  override componentDidMount(): void {
+    this.toDispose.pushAll([
+      this.props.onAppStateDidChange(async (state) => {
+        if (state === 'ready') {
+          const searchResults = await this.queryBoards({});
+          this.setState({ searchResults });
+        }
+      }),
+      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) => {
+        if (typeof query === 'string') {
+          this.setState({ query }, () => this.updateBoards(this.state.query));
+        }
+      }),
+    ]);
+  }
+
+  override componentWillUnmount(): void {
+    this.toDispose.dispose();
+  }
+
+  private readonly 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 })
+    );
+  };
+
+  private readonly queryBoards = async (
+    options: { query?: string } = {}
+  ): Promise<Array<BoardWithPackage>> => {
+    const result = await this.props.searchBoards(options);
+    const { searchSet } = this.props;
+    if (searchSet) {
+      return result.filter((board) =>
+        searchSet.some(
+          (restriction) =>
+            restriction.fqbn === board.fqbn || restriction.name === board.fqbn
+        )
+      );
+    }
+    return result;
+  };
+
+  private readonly toggleFilterPorts = () => {
+    this.setState({ showAllPorts: !this.state.showAllPorts });
+  };
+
+  private readonly selectPort = (selectedPort: PortIdentifier) => {
+    this.props.onPortSelected(selectedPort);
+  };
+
+  private readonly selectBoard = (selectedBoard: BoardWithPackage) => {
+    this.props.onBoardSelected(selectedBoard);
+  };
+
+  private readonly 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)
+        )}
+      </>
+    );
+  }
+
+  private 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>
+    );
+  }
+
+  private renderBoards(): React.ReactNode {
+    const { boardsConfig } = this.props;
+    const { 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(
+      boardsConfig.selectedBoard,
+      searchResults
+    )) {
+      const key = toKey(board);
+      if (!distinctBoards.has(key)) {
+        distinctBoards.set(key, board);
+      }
+    }
+    const title = (board: Board.Detailed): string => {
+      const { details, manuallyInstalled } = board;
+      let label = board.name;
+      if (details) {
+        label += details;
+      }
+      if (manuallyInstalled) {
+        label += nls.localize('arduino/board/inSketchbook', ' (in Sketchbook)');
+      }
+      return label;
+    };
+
+    const boardsList = Array.from(distinctBoards.values()).map((board) => (
+      <Item<Board.Detailed>
+        key={toKey(board)}
+        item={board}
+        label={board.name}
+        details={board.details}
+        selected={board.selected}
+        onClick={this.selectBoard}
+        missing={board.missing}
+        title={title}
+      />
+    ));
+
+    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>
+    );
+  }
+
+  private renderPorts(): React.ReactNode {
+    const predicate = this.state.showAllPorts ? undefined : Port.isVisiblePort;
+    const detectedPorts = this.props.ports(predicate);
+    const matchingIndex = findMatchingPortIndex(
+      this.props.boardsConfig.selectedPort,
+      detectedPorts
+    );
+    return !detectedPorts.length ? (
+      <div className="no-result">
+        {nls.localize('arduino/board/noPortsDiscovered', 'No ports discovered')}
+      </div>
+    ) : (
+      <div className="ports list">
+        {detectedPorts.map((detectedPort, index) => (
+          <Item<Port>
+            key={`${Port.keyOf(detectedPort.port)}`}
+            item={detectedPort.port}
+            label={Port.toString(detectedPort.port)}
+            selected={index === matchingIndex}
+            onClick={this.selectPort}
+          />
+        ))}
+      </div>
+    );
+  }
+
+  private 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>
+    );
+  }
+}

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

@@ -1,71 +0,0 @@
-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 { BoardsServiceProvider } from './boards-service-provider';
-import { NotificationCenter } from '../notification-center';
-
-@injectable()
-export class BoardsConfigDialogWidget extends ReactWidget {
-  @inject(BoardsService)
-  protected readonly boardsService: BoardsService;
-
-  @inject(BoardsServiceProvider)
-  protected readonly boardsServiceClient: BoardsServiceProvider;
-
-  @inject(NotificationCenter)
-  protected readonly notificationCenter: NotificationCenter;
-
-  protected readonly onFilterTextDidChangeEmitter = new Emitter<string>();
-  protected readonly onBoardConfigChangedEmitter =
-    new Emitter<BoardsConfig.Config>();
-  readonly onBoardConfigChanged = this.onBoardConfigChangedEmitter.event;
-
-  protected focusNode: HTMLElement | undefined;
-
-  constructor() {
-    super();
-    this.id = 'select-board-dialog';
-    this.toDispose.pushAll([
-      this.onBoardConfigChangedEmitter,
-      this.onFilterTextDidChangeEmitter,
-    ]);
-  }
-
-  search(query: string): void {
-    this.onFilterTextDidChangeEmitter.fire(query);
-  }
-
-  protected fireConfigChanged = (config: BoardsConfig.Config) => {
-    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();
-    }
-    (this.focusNode || this.node).focus();
-  }
-}

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

@@ -1,142 +0,0 @@
-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 { nls } from '@theia/core/lib/common';
-
-@injectable()
-export class BoardsConfigDialogProps extends DialogProps {}
-
-@injectable()
-export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
-  @inject(BoardsConfigDialogWidget)
-  protected readonly widget: BoardsConfigDialogWidget;
-
-  @inject(BoardsService)
-  protected readonly boardService: BoardsService;
-
-  @inject(BoardsServiceProvider)
-  protected readonly boardsServiceClient: BoardsServiceProvider;
-
-  protected config: BoardsConfig.Config = {};
-
-  constructor(
-    @inject(BoardsConfigDialogProps)
-    protected override readonly props: BoardsConfigDialogProps
-  ) {
-    super({ ...props, maxWidth: 500 });
-
-    this.node.id = 'select-board-dialog-container';
-    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'));
-  }
-
-  @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);
-    }
-
-    return head;
-  }
-
-  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 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 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-dialog.tsx

@@ -0,0 +1,202 @@
+import { DialogError, DialogProps } from '@theia/core/lib/browser/dialogs';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import { Emitter } from '@theia/core/lib/common/event';
+import { nls } from '@theia/core/lib/common/nls';
+import { deepClone } from '@theia/core/lib/common/objects';
+import type { Message } from '@theia/core/shared/@phosphor/messaging';
+import {
+  inject,
+  injectable,
+  postConstruct,
+} from '@theia/core/shared/inversify';
+import React from '@theia/core/shared/react';
+import type { ReactNode } from '@theia/core/shared/react/index';
+import { EditBoardsConfigActionParams } from '../../common/protocol/board-list';
+import {
+  BoardIdentifier,
+  BoardsConfig,
+  BoardWithPackage,
+  DetectedPort,
+  emptyBoardsConfig,
+  PortIdentifier,
+} from '../../common/protocol/boards-service';
+import type { Defined } from '../../common/types';
+import { NotificationCenter } from '../notification-center';
+import { ReactDialog } from '../theia/dialogs/dialogs';
+import { BoardsConfigComponent } from './boards-config-component';
+import { BoardsServiceProvider } from './boards-service-provider';
+
+@injectable()
+export class BoardsConfigDialogProps extends DialogProps {}
+
+export type BoardsConfigDialogState = Omit<BoardsConfig, 'selectedBoard'> & {
+  selectedBoard: BoardsConfig['selectedBoard'] | BoardWithPackage;
+};
+
+@injectable()
+export class BoardsConfigDialog extends ReactDialog<BoardsConfigDialogState> {
+  @inject(BoardsServiceProvider)
+  private readonly boardsServiceProvider: BoardsServiceProvider;
+  @inject(NotificationCenter)
+  private readonly notificationCenter: NotificationCenter;
+  @inject(FrontendApplicationStateService)
+  private readonly appStateService: FrontendApplicationStateService;
+
+  private readonly onFilterTextDidChangeEmitter: Emitter<
+    Defined<EditBoardsConfigActionParams['query']>
+  >;
+  private readonly onBoardSelected = (board: BoardWithPackage): void => {
+    this._boardsConfig.selectedBoard = board;
+    this.update();
+  };
+  private readonly onPortSelected = (port: PortIdentifier): void => {
+    this._boardsConfig.selectedPort = port;
+    this.update();
+  };
+  private readonly setFocusNode = (element: HTMLElement | undefined): void => {
+    this.focusNode = element;
+  };
+  private readonly searchBoards = (options: {
+    query?: string;
+  }): Promise<BoardWithPackage[]> => {
+    return this.boardsServiceProvider.searchBoards(options);
+  };
+  private readonly ports = (
+    predicate?: (port: DetectedPort) => boolean
+  ): readonly DetectedPort[] => {
+    return this.boardsServiceProvider.boardList.ports(predicate);
+  };
+  private _boardsConfig: BoardsConfigDialogState;
+  /**
+   * When the dialog's boards result set is limited to a subset of boards when searching, this field is set.
+   */
+  private _searchSet: BoardIdentifier[] | undefined;
+  private focusNode: HTMLElement | undefined;
+
+  constructor(
+    @inject(BoardsConfigDialogProps)
+    protected override readonly props: BoardsConfigDialogProps
+  ) {
+    super({ ...props, maxWidth: 500 });
+    this.node.id = 'select-board-dialog-container';
+    this.contentNode.classList.add('select-board-dialog');
+    this.appendCloseButton(
+      nls.localize('vscode/issueMainService/cancel', 'Cancel')
+    );
+    this.appendAcceptButton(nls.localize('vscode/issueMainService/ok', 'OK'));
+    this._boardsConfig = emptyBoardsConfig();
+    this.onFilterTextDidChangeEmitter = new Emitter();
+  }
+
+  @postConstruct()
+  protected init(): void {
+    this.boardsServiceProvider.onBoardListDidChange(() => {
+      this._boardsConfig = deepClone(this.boardsServiceProvider.boardsConfig);
+      this.update();
+    });
+    this._boardsConfig = deepClone(this.boardsServiceProvider.boardsConfig);
+  }
+
+  override async open(
+    params?: EditBoardsConfigActionParams
+  ): Promise<BoardsConfig | undefined> {
+    this._searchSet = undefined;
+    this._boardsConfig.selectedBoard =
+      this.boardsServiceProvider.boardsConfig.selectedBoard;
+    this._boardsConfig.selectedPort =
+      this.boardsServiceProvider.boardsConfig.selectedPort;
+    if (params) {
+      if (typeof params.query === 'string') {
+        this.onFilterTextDidChangeEmitter.fire(params.query);
+      }
+      if (params.portToSelect) {
+        this._boardsConfig.selectedPort = params.portToSelect;
+      }
+      if (params.boardToSelect) {
+        this._boardsConfig.selectedBoard = params.boardToSelect;
+      }
+      if (params.searchSet) {
+        this._searchSet = params.searchSet.slice();
+      }
+    }
+    return super.open();
+  }
+
+  protected override onAfterAttach(msg: Message): void {
+    super.onAfterAttach(msg);
+    this.update();
+  }
+
+  protected override render(): ReactNode {
+    return (
+      <>
+        <div className="head">
+          <div className="text">
+            <div>
+              {nls.localize(
+                'arduino/board/configDialog1',
+                'Select both a Board and a Port if you want to upload a sketch.'
+              )}
+            </div>
+            <div>
+              {nls.localize(
+                'arduino/board/configDialog2',
+                'If you only select a Board you will be able to compile, but not to upload your sketch.'
+              )}
+            </div>
+          </div>
+        </div>
+        <div id="select-board-dialog" className="p-Widget ps">
+          <div className="selectBoardContainer">
+            <BoardsConfigComponent
+              boardsConfig={this._boardsConfig}
+              searchSet={this._searchSet}
+              onBoardSelected={this.onBoardSelected}
+              onPortSelected={this.onPortSelected}
+              notificationCenter={this.notificationCenter}
+              onFocusNodeSet={this.setFocusNode}
+              onFilteredTextDidChangeEvent={
+                this.onFilterTextDidChangeEmitter.event
+              }
+              appState={this.appStateService.state}
+              onAppStateDidChange={this.notificationCenter.onAppStateDidChange}
+              searchBoards={this.searchBoards}
+              ports={this.ports}
+            />
+          </div>
+        </div>
+      </>
+    );
+  }
+
+  protected override onActivateRequest(msg: Message): void {
+    super.onActivateRequest(msg);
+    if (this.focusNode instanceof HTMLInputElement) {
+      this.focusNode.select();
+    }
+    (this.focusNode || this.node).focus();
+  }
+
+  protected override handleEnter(event: KeyboardEvent): boolean | void {
+    if (event.target instanceof HTMLTextAreaElement) {
+      return false;
+    }
+  }
+
+  protected override isValid(value: BoardsConfig): 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(): BoardsConfigDialogState {
+    return this._boardsConfig;
+  }
+}

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

@@ -1,432 +0,0 @@
-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,
-  BoardConfig as ProtocolBoardConfig,
-  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 type Config = ProtocolBoardConfig;
-
-  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;
-}> {
-  override 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>
-    );
-  }
-
-  protected onClick = () => {
-    this.props.onClick(this.props.item);
-  };
-}
-
-export class BoardsConfig extends React.Component<
-  BoardsConfig.Props,
-  BoardsConfig.State
-> {
-  protected toDispose = new DisposableCollection();
-
-  constructor(props: BoardsConfig.Props) {
-    super(props);
-
-    const { boardsConfig } = props.boardsServiceProvider;
-    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)
-          );
-        }
-      }),
-      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))
-      ),
-    ]);
-  }
-
-  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);
-      }
-    }
-
-    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}
-      />
-    ));
-
-    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.address}` : ''}`;
-    }
-  }
-}

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

@@ -1,71 +1,168 @@
-import { injectable, inject, named } from '@theia/core/shared/inversify';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import { StorageService } from '@theia/core/lib/browser/storage-service';
+import type {
+  Command,
+  CommandContribution,
+  CommandRegistry,
+} from '@theia/core/lib/common/command';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { Emitter, Event } from '@theia/core/lib/common/event';
 import { ILogger } from '@theia/core/lib/common/logger';
-import { deepClone } from '@theia/core/lib/common/objects';
-import { Event, Emitter } from '@theia/core/lib/common/event';
-import {
-  FrontendApplicationContribution,
-  LocalStorageService,
-} from '@theia/core/lib/browser';
-import { notEmpty } from '../../common/utils';
+import { deepClone, deepFreeze } from '@theia/core/lib/common/objects';
+import type { Mutable } from '@theia/core/lib/common/types';
+import { inject, injectable, named } from '@theia/core/shared/inversify';
 import {
+  BoardDetails,
   BoardsService,
   ConfigOption,
-  BoardDetails,
+  ConfigValue,
   Programmer,
+  isBoardIdentifierChangeEvent,
+  isProgrammer,
 } from '../../common/protocol';
+import { notEmpty } from '../../common/utils';
+import type {
+  StartupTask,
+  StartupTaskProvider,
+} from '../../electron-common/startup-task';
 import { NotificationCenter } from '../notification-center';
+import { BoardsServiceProvider } from './boards-service-provider';
 
 @injectable()
-export class BoardsDataStore implements FrontendApplicationContribution {
+export class BoardsDataStore
+  implements
+    FrontendApplicationContribution,
+    StartupTaskProvider,
+    CommandContribution
+{
   @inject(ILogger)
   @named('store')
-  protected readonly logger: ILogger;
-
+  private readonly logger: ILogger;
   @inject(BoardsService)
-  protected readonly boardsService: BoardsService;
-
+  private readonly boardsService: BoardsService;
   @inject(NotificationCenter)
-  protected readonly notificationCenter: NotificationCenter;
+  private readonly notificationCenter: NotificationCenter;
+  // When `@theia/workspace` is part of the application, the workspace-scoped storage service is the default implementation, and the `StorageService` symbol must be used for the injection.
+  // https://github.com/eclipse-theia/theia/blob/ba3722b04ff91eb6a4af6a571c9e263c77cdd8b5/packages/workspace/src/browser/workspace-frontend-module.ts#L97-L98
+  // In other words, store the data (such as the board configs) per sketch, not per IDE2 installation. https://github.com/arduino/arduino-ide/issues/2240
+  @inject(StorageService)
+  private readonly storageService: StorageService;
+  @inject(BoardsServiceProvider)
+  private readonly boardsServiceProvider: BoardsServiceProvider;
+  @inject(FrontendApplicationStateService)
+  private readonly appStateService: FrontendApplicationStateService;
 
-  @inject(LocalStorageService)
-  protected readonly storageService: LocalStorageService;
-
-  protected readonly onChangedEmitter = new Emitter<string[]>();
+  private readonly onDidChangeEmitter =
+    new Emitter<BoardsDataStoreChangeEvent>();
+  private readonly toDispose = new DisposableCollection(
+    this.onDidChangeEmitter
+  );
+  private _selectedBoardData: BoardsDataStoreChange | undefined;
 
   onStart(): void {
+    this.toDispose.pushAll([
+      this.boardsServiceProvider.onBoardsConfigDidChange((event) => {
+        if (isBoardIdentifierChangeEvent(event)) {
+          this.updateSelectedBoardData(event.selectedBoard?.fqbn);
+        }
+      }),
       this.notificationCenter.onPlatformDidInstall(async ({ item }) => {
-      const dataDidChangePerFqbn: string[] = [];
-      for (const fqbn of item.boards
+        const boardsWithFqbn = item.boards
           .map(({ fqbn }) => fqbn)
-        .filter(notEmpty)
-        .filter((fqbn) => !!fqbn)) {
+          .filter(notEmpty);
+        const changes: BoardsDataStoreChange[] = [];
+        for (const fqbn of boardsWithFqbn) {
           const key = this.getStorageKey(fqbn);
-        let data = await this.storageService.getData<
-          ConfigOption[] | undefined
-        >(key);
-        if (!data || !data.length) {
-          const details = await this.getBoardDetailsSafe(fqbn);
+          const storedData =
+            await this.storageService.getData<BoardsDataStore.Data>(key);
+          if (!storedData) {
+            // if no previously value is available for the board, do not update the cache
+            continue;
+          }
+          const details = await this.loadBoardDetails(fqbn);
           if (details) {
-            data = details.configOptions;
-            if (data.length) {
+            const data = createDataStoreEntry(details);
             await this.storageService.setData(key, data);
-              dataDidChangePerFqbn.push(fqbn);
+            changes.push({ fqbn, data });
           }
         }
+        if (changes.length) {
+          this.fireChanged(...changes);
+        }
+      }),
+      this.onDidChange((event) => {
+        const selectedFqbn =
+          this.boardsServiceProvider.boardsConfig.selectedBoard?.fqbn;
+        if (event.changes.find((change) => change.fqbn === selectedFqbn)) {
+          this.updateSelectedBoardData(selectedFqbn);
+        }
+      }),
+    ]);
+
+    Promise.all([
+      this.boardsServiceProvider.ready,
+      this.appStateService.reachedState('ready'),
+    ]).then(() =>
+      this.updateSelectedBoardData(
+        this.boardsServiceProvider.boardsConfig.selectedBoard?.fqbn
+      )
+    );
+  }
+
+  private async getSelectedBoardData(
+    fqbn: string | undefined
+  ): Promise<BoardsDataStoreChange | undefined> {
+    if (!fqbn) {
+      return undefined;
+    } else {
+      const data = await this.getData(fqbn);
+      if (data === BoardsDataStore.Data.EMPTY) {
+        return undefined;
+      }
+      return { fqbn, data };
     }
   }
-      if (dataDidChangePerFqbn.length) {
-        this.fireChanged(...dataDidChangePerFqbn);
+
+  private async updateSelectedBoardData(
+    fqbn: string | undefined
+  ): Promise<void> {
+    this._selectedBoardData = await this.getSelectedBoardData(fqbn);
   }
+
+  onStop(): void {
+    this.toDispose.dispose();
+  }
+
+  registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(USE_INHERITED_DATA, {
+      execute: async (arg: unknown) => {
+        if (isBoardsDataStoreChange(arg)) {
+          await this.setData(arg);
+          this.fireChanged(arg);
+        }
+      },
     });
   }
 
-  get onChanged(): Event<string[]> {
-    return this.onChangedEmitter.event;
+  tasks(): StartupTask[] {
+    if (!this._selectedBoardData) {
+      return [];
+    }
+    return [
+      {
+        command: USE_INHERITED_DATA.id,
+        args: [this._selectedBoardData],
+      },
+    ];
+  }
+
+  get onDidChange(): Event<BoardsDataStoreChangeEvent> {
+    return this.onDidChangeEmitter.event;
   }
 
   async appendConfigToFqbn(
-    fqbn: string | undefined,
+    fqbn: string | undefined
   ): Promise<string | undefined> {
     if (!fqbn) {
       return undefined;
@@ -80,53 +177,51 @@ export class BoardsDataStore implements FrontendApplicationContribution {
     }
 
     const key = this.getStorageKey(fqbn);
-    let data = await this.storageService.getData<
+    const storedData = await this.storageService.getData<
       BoardsDataStore.Data | undefined
     >(key, undefined);
-    if (BoardsDataStore.Data.is(data)) {
-      return data;
+    if (BoardsDataStore.Data.is(storedData)) {
+      return storedData;
     }
 
-    const boardDetails = await this.getBoardDetailsSafe(fqbn);
+    const boardDetails = await this.loadBoardDetails(fqbn);
     if (!boardDetails) {
       return BoardsDataStore.Data.EMPTY;
     }
 
-    data = {
-      configOptions: boardDetails.configOptions,
-      programmers: boardDetails.programmers,
-    };
+    const data = createDataStoreEntry(boardDetails);
     await this.storageService.setData(key, data);
     return data;
   }
 
-  async selectProgrammer(
-    {
+  async selectProgrammer({
     fqbn,
     selectedProgrammer,
-    }: { fqbn: string; selectedProgrammer: Programmer },
-  ): Promise<boolean> {
-    const data = deepClone(await this.getData(fqbn));
-    const { programmers } = data;
+  }: {
+    fqbn: string;
+    selectedProgrammer: Programmer;
+  }): Promise<boolean> {
+    const storedData = deepClone(await this.getData(fqbn));
+    const { programmers } = storedData;
     if (!programmers.find((p) => Programmer.equals(selectedProgrammer, p))) {
       return false;
     }
 
-    await this.setData({
-      fqbn,
-      data: { ...data, selectedProgrammer },
-    });
-    this.fireChanged(fqbn);
+    const data = { ...storedData, selectedProgrammer };
+    await this.setData({ fqbn, data });
+    this.fireChanged({ fqbn, data });
     return true;
   }
 
-  async selectConfigOption(
-    {
+  async selectConfigOption({
     fqbn,
     option,
     selectedValue,
-    }: { fqbn: string; option: string; selectedValue: string }
-  ): Promise<boolean> {
+  }: {
+    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);
@@ -135,28 +230,24 @@ export class BoardsDataStore implements FrontendApplicationContribution {
     }
     let updated = false;
     for (const value of configOption.values) {
-      if (value.value === selectedValue) {
-        (value as any).selected = true;
+      const mutable: Mutable<ConfigValue> = value;
+      if (mutable.value === selectedValue) {
+        mutable.selected = true;
         updated = true;
       } else {
-        (value as any).selected = false;
+        mutable.selected = false;
       }
     }
     if (!updated) {
       return false;
     }
     await this.setData({ fqbn, data });
-    this.fireChanged(fqbn);
+    this.fireChanged({ fqbn, data });
     return true;
   }
 
-  protected async setData({
-    fqbn,
-    data,
-  }: {
-    fqbn: string;
-    data: BoardsDataStore.Data;
-  }): Promise<void> {
+  protected async setData(change: BoardsDataStoreChange): Promise<void> {
+    const { fqbn, data } = change;
     const key = this.getStorageKey(fqbn);
     return this.storageService.setData(key, data);
   }
@@ -165,11 +256,9 @@ export class BoardsDataStore implements FrontendApplicationContribution {
     return `.arduinoIDE-configOptions-${fqbn}`;
   }
 
-  protected async getBoardDetailsSafe(
-    fqbn: string
-  ): Promise<BoardDetails | undefined> {
+  async loadBoardDetails(fqbn: string): Promise<BoardDetails | undefined> {
     try {
-      const details = this.boardsService.getBoardDetails({ fqbn });
+      const details = await this.boardsService.getBoardDetails({ fqbn });
       return details;
     } catch (err) {
       if (
@@ -190,8 +279,8 @@ export class BoardsDataStore implements FrontendApplicationContribution {
     }
   }
 
-  protected fireChanged(...fqbn: string[]): void {
-    this.onChangedEmitter.fire(fqbn);
+  protected fireChanged(...changes: BoardsDataStoreChange[]): void {
+    this.onDidChangeEmitter.fire({ changes });
   }
 }
 
@@ -200,20 +289,86 @@ export namespace BoardsDataStore {
     readonly configOptions: ConfigOption[];
     readonly programmers: Programmer[];
     readonly selectedProgrammer?: Programmer;
+    readonly defaultProgrammerId?: string;
   }
   export namespace Data {
-    export const EMPTY: Data = {
+    export const EMPTY: Data = deepFreeze({
       configOptions: [],
       programmers: [],
-    };
-    export function is(arg: any): arg is Data {
+    });
+
+    export function is(arg: unknown): arg is Data {
       return (
-        !!arg &&
-        'configOptions' in arg &&
-        Array.isArray(arg['configOptions']) &&
-        'programmers' in arg &&
-        Array.isArray(arg['programmers'])
+        typeof arg === 'object' &&
+        arg !== null &&
+        Array.isArray((<Data>arg).configOptions) &&
+        Array.isArray((<Data>arg).programmers) &&
+        ((<Data>arg).selectedProgrammer === undefined ||
+          isProgrammer((<Data>arg).selectedProgrammer)) &&
+        ((<Data>arg).defaultProgrammerId === undefined ||
+          typeof (<Data>arg).defaultProgrammerId === 'string')
       );
     }
   }
 }
+
+export function isEmptyData(data: BoardsDataStore.Data): boolean {
+  return (
+    Boolean(!data.configOptions.length) &&
+    Boolean(!data.programmers.length) &&
+    Boolean(!data.selectedProgrammer) &&
+    Boolean(!data.defaultProgrammerId)
+  );
+}
+
+export function findDefaultProgrammer(
+  programmers: readonly Programmer[],
+  defaultProgrammerId: string | undefined | BoardsDataStore.Data
+): Programmer | undefined {
+  if (!defaultProgrammerId) {
+    return undefined;
+  }
+  const id =
+    typeof defaultProgrammerId === 'string'
+      ? defaultProgrammerId
+      : defaultProgrammerId.defaultProgrammerId;
+  return programmers.find((p) => p.id === id);
+}
+function createDataStoreEntry(details: BoardDetails): BoardsDataStore.Data {
+  const configOptions = details.configOptions.slice();
+  const programmers = details.programmers.slice();
+  const { defaultProgrammerId } = details;
+  const selectedProgrammer = findDefaultProgrammer(
+    programmers,
+    defaultProgrammerId
+  );
+  const data = {
+    configOptions,
+    programmers,
+    ...(selectedProgrammer ? { selectedProgrammer } : {}),
+    ...(defaultProgrammerId ? { defaultProgrammerId } : {}),
+  };
+  return data;
+}
+
+export interface BoardsDataStoreChange {
+  readonly fqbn: string;
+  readonly data: BoardsDataStore.Data;
+}
+
+function isBoardsDataStoreChange(arg: unknown): arg is BoardsDataStoreChange {
+  return (
+    typeof arg === 'object' &&
+    arg !== null &&
+    typeof (<BoardsDataStoreChange>arg).fqbn === 'string' &&
+    BoardsDataStore.Data.is((<BoardsDataStoreChange>arg).data)
+  );
+}
+
+export interface BoardsDataStoreChangeEvent {
+  readonly changes: readonly BoardsDataStoreChange[];
+}
+
+const USE_INHERITED_DATA: Command = {
+  id: 'arduino-use-inherited-boards-data',
+};

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

@@ -1,16 +1,21 @@
-import * as React from '@theia/core/shared/react';
-import * as ReactDOM from '@theia/core/shared/react-dom';
+import { TabBarToolbar } from '@theia/core/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar';
+import { codicon } from '@theia/core/lib/browser/widgets/widget';
 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';
+  Disposable,
+  DisposableCollection,
+} from '@theia/core/lib/common/disposable';
+import { nls } from '@theia/core/lib/common/nls';
+import React from '@theia/core/shared/react';
+import ReactDOM from '@theia/core/shared/react-dom';
 import classNames from 'classnames';
-import { BoardsConfig } from './boards-config';
+import { boardIdentifierLabel, Port } from '../../common/protocol';
+import { BoardListItemUI } from '../../common/protocol/board-list';
+import { assertUnreachable } from '../../common/utils';
+import type {
+  BoardListUI,
+  BoardsServiceProvider,
+} from './boards-service-provider';
 
 export interface BoardsDropDownListCoords {
   readonly top: number;
@@ -22,18 +27,18 @@ export interface BoardsDropDownListCoords {
 export namespace BoardsDropDown {
   export interface Props {
     readonly coords: BoardsDropDownListCoords | 'hidden';
-    readonly items: Array<AvailableBoard & { onClick: () => void; port: Port }>;
+    readonly boardList: BoardListUI;
     readonly openBoardsConfig: () => void;
+    readonly hide: () => void;
   }
 }
 
-export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
-  protected dropdownElement: HTMLElement;
+export class BoardListDropDown extends React.Component<BoardsDropDown.Props> {
+  private dropdownElement: HTMLElement;
   private listRef: React.RefObject<HTMLDivElement>;
 
   constructor(props: BoardsDropDown.Props) {
     super(props);
-
     this.listRef = React.createRef();
     let list = document.getElementById('boards-dropdown-container');
     if (!list) {
@@ -51,11 +56,14 @@ export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
   }
 
   override render(): React.ReactNode {
-    return ReactDOM.createPortal(this.renderNode(), this.dropdownElement);
+    return ReactDOM.createPortal(
+      this.renderBoardListItems(),
+      this.dropdownElement
+    );
   }
 
-  protected renderNode(): React.ReactNode {
-    const { coords, items } = this.props;
+  private renderBoardListItems(): React.ReactNode {
+    const { coords, boardList } = this.props;
     if (coords === 'hidden') {
       return '';
     }
@@ -74,14 +82,12 @@ export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
         tabIndex={0}
       >
         <div className="arduino-boards-dropdown-list--items-container">
-          {items
-            .map(({ name, port, selected, onClick }) => ({
-              boardLabel: name,
-              port,
-              selected,
-              onClick,
-            }))
-            .map(this.renderItem)}
+          {boardList.items.map((item, index) =>
+            this.renderBoardListItem({
+              item,
+              selected: index === boardList.selectedIndex,
+            })
+          )}
         </div>
         <div
           key={footerLabel}
@@ -95,31 +101,43 @@ export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
     );
   }
 
-  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();
+  private readonly onDefaultAction = (item: BoardListItemUI): unknown => {
+    const { boardList, hide } = this.props;
+    const { type, params } = item.defaultAction;
+    hide();
+    switch (type) {
+      case 'select-boards-config': {
+        return boardList.select(params);
+      }
+      case 'edit-boards-config': {
+        return boardList.edit(params);
+      }
+      default:
+        return assertUnreachable(type);
     }
   };
 
+  private renderBoardListItem({
+    item,
+    selected,
+  }: {
+    item: BoardListItemUI;
+    selected: boolean;
+  }): React.ReactNode {
+    const { boardLabel, portLabel, portProtocol, tooltip } = item.labels;
+    const port = item.port;
+    const onKeyUp = (e: React.KeyboardEvent) => {
+      if (e.key === 'Enter') {
+        this.onDefaultAction(item);
+      }
+    };
     return (
       <div
-        key={`board-item--${boardLabel}-${port.address}`}
+        key={`board-item--${Port.keyOf(port)}`}
         className={classNames('arduino-boards-dropdown-item', {
           'arduino-boards-dropdown-item--selected': selected,
         })}
-        onClick={onClick}
+        onClick={() => this.onDefaultAction(item)}
         onKeyUp={onKeyUp}
         tabIndex={0}
       >
@@ -127,21 +145,81 @@ export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
           className={classNames(
             'arduino-boards-dropdown-item--protocol',
             'fa',
-            protocolIcon
+            iconNameFromProtocol(portProtocol)
           )}
         />
-        <div
-          className="arduino-boards-dropdown-item--label"
-          title={`${boardLabel}\n${port.address}`}
-        >
+        <div className="arduino-boards-dropdown-item--label" title={tooltip}>
+          <div className="arduino-boards-dropdown-item--board-header">
             <div className="arduino-boards-dropdown-item--board-label noWrapInfo noselect">
               {boardLabel}
             </div>
+          </div>
           <div className="arduino-boards-dropdown-item--port-label noWrapInfo noselect">
-            {port.addressLabel}
+            {portLabel}
           </div>
         </div>
-        {selected ? <div className="fa fa-check" /> : ''}
+        {this.renderActions(item)}
+      </div>
+    );
+  }
+
+  private renderActions(item: BoardListItemUI): React.ReactNode {
+    const { boardList, hide } = this.props;
+    const { revert, edit } = item.otherActions;
+    if (!edit && !revert) {
+      return undefined;
+    }
+    const handleOnClick = (
+      event: React.MouseEvent<HTMLElement, MouseEvent>,
+      callback: () => void
+    ) => {
+      event.preventDefault();
+      event.stopPropagation();
+      hide();
+      callback();
+    };
+    return (
+      <div className={TabBarToolbar.Styles.TAB_BAR_TOOLBAR}>
+        {edit && (
+          <div
+            className={`${TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM} enabled`}
+          >
+            {
+              <div
+                id="edit"
+                className={codicon('pencil', true)}
+                title={nls.localize(
+                  'arduino/board/editBoardsConfig',
+                  'Edit Board and Port...'
+                )}
+                onClick={(event) =>
+                  handleOnClick(event, () => boardList.edit(edit.params))
+                }
+              />
+            }
+          </div>
+        )}
+        {revert && (
+          <div
+            className={`${TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM} enabled`}
+          >
+            {
+              <div
+                id="revert"
+                className={codicon('discard', true)}
+                title={nls.localize(
+                  'arduino/board/revertBoardsConfig',
+                  "Use '{0}' discovered on '{1}'",
+                  boardIdentifierLabel(revert.params.selectedBoard),
+                  item.labels.portLabel
+                )}
+                onClick={(event) =>
+                  handleOnClick(event, () => boardList.select(revert.params))
+                }
+              />
+            }
+          </div>
+        )}
       </div>
     );
   }
@@ -153,26 +231,27 @@ export class BoardsToolBarItem extends React.Component<
 > {
   static TOOLBAR_ID: 'boards-toolbar';
 
-  protected readonly toDispose: DisposableCollection =
-    new DisposableCollection();
+  private readonly toDispose: DisposableCollection;
 
   constructor(props: BoardsToolBarItem.Props) {
     super(props);
-
-    const { availableBoards } = props.boardsServiceProvider;
+    const { boardList } = props.boardsServiceProvider;
     this.state = {
-      availableBoards,
+      boardList,
       coords: 'hidden',
     };
-
-    document.addEventListener('click', () => {
-      this.setState({ coords: 'hidden' });
-    });
+    const listener = () => this.setState({ coords: 'hidden' });
+    document.addEventListener('click', listener);
+    this.toDispose = new DisposableCollection(
+      Disposable.create(() => document.removeEventListener('click', listener))
+    );
   }
 
   override componentDidMount(): void {
-    this.props.boardsServiceProvider.onAvailableBoardsChanged(
-      (availableBoards) => this.setState({ availableBoards })
+    this.toDispose.push(
+      this.props.boardsServiceProvider.onBoardListDidChange((boardList) =>
+        this.setState({ boardList })
+      )
     );
   }
 
@@ -180,7 +259,7 @@ export class BoardsToolBarItem extends React.Component<
     this.toDispose.dispose();
   }
 
-  protected readonly show = (event: React.MouseEvent<HTMLElement>): void => {
+  private readonly show = (event: React.MouseEvent<HTMLElement>): void => {
     const { currentTarget: element } = event;
     if (element instanceof HTMLElement) {
       if (this.state.coords === 'hidden') {
@@ -201,31 +280,26 @@ export class BoardsToolBarItem extends React.Component<
     event.nativeEvent.stopImmediatePropagation();
   };
 
+  private readonly hide = () => {
+    this.setState({ coords: 'hidden' });
+  };
+
   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 || '')
+    const { coords, boardList } = this.state;
+    const { boardLabel, selected, portProtocol, tooltip } = boardList.labels;
+    const protocolIcon = portProtocol
+      ? iconNameFromProtocol(portProtocol)
       : null;
     const protocolIconClassNames = classNames(
       'arduino-boards-toolbar-item--protocol',
       'fa',
       protocolIcon
     );
-
     return (
       <React.Fragment>
         <div
           className="arduino-boards-toolbar-item-container"
-          title={selectedPortLabel}
+          title={tooltip}
           onClick={this.show}
         >
           {protocolIcon && <div className={protocolIconClassNames} />}
@@ -234,57 +308,22 @@ export class BoardsToolBarItem extends React.Component<
               'arduino-boards-toolbar-item--label',
               'noWrapInfo',
               'noselect',
-              { 'arduino-boards-toolbar-item--label-connected': isConnected }
+              { 'arduino-boards-toolbar-item--label-connected': selected }
             )}
           >
             {boardLabel}
           </div>
           <div className="fa fa-caret-down caret" />
         </div>
-        <BoardsDropDown
+        <BoardListDropDown
           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>
+          boardList={boardList}
+          openBoardsConfig={() => boardList.edit({ query: '' })}
+          hide={this.hide}
+        />
       </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 {
@@ -293,7 +332,7 @@ export namespace BoardsToolBarItem {
   }
 
   export interface State {
-    availableBoards: AvailableBoard[];
+    boardList: BoardListUI;
     coords: BoardsDropDownListCoords | 'hidden';
   }
 }
@@ -304,19 +343,10 @@ function iconNameFromProtocol(protocol: string): string {
       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';
+    // it is fine to assign dedicated icons to the protocols used by the official boards,
+    // but other than that it is best to avoid implementing any special handling
+    // for specific protocols in the IDE codebase.
     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/components/ProgressBar.tsx

@@ -1,4 +1,4 @@
-import * as React from '@theia/core/shared/react';
+import React from '@theia/core/shared/react';
 
 export type ProgressBarProps = {
   percent?: number;

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

@@ -1,26 +1,24 @@
-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 { nls } from '@theia/core/lib/common/nls';
+import { isOSX, isWindows } from '@theia/core/lib/common/os';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import moment from 'moment';
+import { AppService } from '../app-service';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import { ConfigService } from '../../common/protocol';
-import { nls } from '@theia/core/lib/common';
+import {
+  Command,
+  CommandRegistry,
+  Contribution,
+  MenuModelRegistry,
+} from './contribution';
 
 @injectable()
 export class About extends Contribution {
   @inject(ClipboardService)
-  protected readonly clipboardService: ClipboardService;
-
-  @inject(ConfigService)
-  protected readonly configService: ConfigService;
+  private readonly clipboardService: ClipboardService;
+  @inject(AppService)
+  private readonly appService: AppService;
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(About.Commands.ABOUT_APP, {
@@ -40,17 +38,18 @@ export class About extends Contribution {
     });
   }
 
-  async showAbout(): Promise<void> {
-    const version = await this.configService.getVersion();
-    const buildDate = this.buildDate;
+  private async showAbout(): Promise<void> {
+    const appInfo = await this.appService.info();
+    const { appVersion, cliVersion, buildDate } = appInfo;
+
     const detail = (showAll: boolean) =>
       nls.localize(
         'arduino/about/detail',
         'Version: {0}\nDate: {1}{2}\nCLI Version: {3}\n\n{4}',
-        remote.app.getVersion(),
+        appVersion,
         buildDate ? buildDate : nls.localize('', 'dev build'),
         buildDate && showAll ? ` (${this.ago(buildDate)})` : '',
-        version,
+        cliVersion,
         nls.localize(
           'arduino/about/copyright',
           'Copyright © {0} Arduino SA',
@@ -60,9 +59,7 @@ export class About extends Contribution {
     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(),
-      {
+    const { response } = await this.dialogService.showMessageBox({
       message: `${this.applicationName}`,
       title: `${this.applicationName}`,
       type: 'info',
@@ -71,23 +68,18 @@ export class About extends Contribution {
       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 {
+  private get applicationName(): string {
     return FrontendApplicationConfigProvider.get().applicationName;
   }
 
-  protected get buildDate(): string | undefined {
-    return FrontendApplicationConfigProvider.get().buildDate;
-  }
-
-  protected ago(isoTime: string): string {
+  private ago(isoTime: string): string {
     const now = moment(Date.now());
     const other = moment(isoTime);
     let result = now.diff(other, 'minute');

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

@@ -1,22 +1,21 @@
+import { nls } from '@theia/core/lib/common/nls';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import * as remote from '@theia/core/electron-shared/@electron/remote';
+import { FileDialogService } from '@theia/filesystem/lib/browser';
 import { ArduinoMenus } from '../menu/arduino-menus';
+import { CurrentSketch } from '../sketches-service-client-impl';
 import {
-  SketchContribution,
   Command,
   CommandRegistry,
   MenuModelRegistry,
-  URI,
   Sketch,
+  SketchContribution,
+  URI,
 } from './contribution';
-import { FileDialogService } from '@theia/filesystem/lib/browser';
-import { nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../sketches-service-client-impl';
 
 @injectable()
 export class AddFile extends SketchContribution {
   @inject(FileDialogService)
-  private readonly fileDialogService: FileDialogService;
+  private readonly fileDialogService: FileDialogService; // TODO: use dialogService
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(AddFile.Commands.ADD_FILE, {
@@ -50,7 +49,7 @@ export class AddFile extends SketchContribution {
     const { uri: targetUri, filename } = this.resolveTarget(sketch, toAddUri);
     const exists = await this.fileService.exists(targetUri);
     if (exists) {
-      const { response } = await remote.dialog.showMessageBox({
+      const { response } = await this.dialogService.showMessageBox({
         type: 'question',
         title: nls.localize('arduino/contributions/replaceTitle', 'Replace'),
         buttons: [

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

@@ -1,5 +1,4 @@
 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 { ArduinoMenus } from '../menu/arduino-menus';
@@ -42,9 +41,7 @@ export class AddZipLibrary extends SketchContribution {
   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(),
-      {
+    const { canceled, filePaths } = await this.dialogService.showOpenDialog({
       title: nls.localize(
         'arduino/selectZip',
         "Select a zip file containing the library you'd like to add"
@@ -57,8 +54,7 @@ export class AddZipLibrary extends SketchContribution {
           extensions: ['zip'],
         },
       ],
-      }
-    );
+    });
     if (!canceled && filePaths.length) {
       const zipUri = await this.fileSystemExt.getUri(filePaths[0]);
       try {

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

@@ -1,6 +1,5 @@
 import { injectable } from '@theia/core/shared/inversify';
-import * as remote from '@theia/core/electron-shared/@electron/remote';
-import * as dateFormat from 'dateformat';
+import dateFormat from 'dateformat';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import {
   SketchContribution,
@@ -39,16 +38,13 @@ export class ArchiveSketch extends SketchContribution {
     const defaultContainerUri = await this.defaultUri();
     const defaultUri = defaultContainerUri.resolve(archiveBasename);
     const defaultPath = await this.fileService.fsPath(defaultUri);
-    const { filePath, canceled } = await remote.dialog.showSaveDialog(
-      remote.getCurrentWindow(),
-      {
+    const { filePath, canceled } = await this.dialogService.showSaveDialog({
       title: nls.localize(
         'arduino/sketch/saveSketchAs',
         'Save sketch folder as...'
       ),
       defaultPath,
-      }
-    );
+    });
     if (!filePath || canceled) {
       return;
     }

arduino-ide-extension/src/browser/contributions/auto-select-programmer.ts

@@ -0,0 +1,123 @@
+import type { MaybePromise } from '@theia/core/lib/common/types';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import {
+  BoardDetails,
+  Programmer,
+  isBoardIdentifierChangeEvent,
+} from '../../common/protocol';
+import {
+  BoardsDataStore,
+  findDefaultProgrammer,
+  isEmptyData,
+} from '../boards/boards-data-store';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import { Contribution } from './contribution';
+
+/**
+ * Before CLI 0.35.0-rc.3, there was no `programmer#default` property in the `board details` response.
+ * This method does the programmer migration in the data store. If there is a programmer selected, it's a noop.
+ * If no programmer is selected, it forcefully reloads the details from the CLI and updates it in the local storage.
+ */
+@injectable()
+export class AutoSelectProgrammer extends Contribution {
+  @inject(BoardsServiceProvider)
+  private readonly boardsServiceProvider: BoardsServiceProvider;
+  @inject(BoardsDataStore)
+  private readonly boardsDataStore: BoardsDataStore;
+
+  override onStart(): void {
+    this.boardsServiceProvider.onBoardsConfigDidChange((event) => {
+      if (isBoardIdentifierChangeEvent(event)) {
+        this.ensureProgrammerIsSelected();
+      }
+    });
+  }
+
+  override onReady(): void {
+    this.boardsServiceProvider.ready.then(() =>
+      this.ensureProgrammerIsSelected()
+    );
+  }
+
+  private async ensureProgrammerIsSelected(): Promise<boolean> {
+    return ensureProgrammerIsSelected({
+      fqbn: this.boardsServiceProvider.boardsConfig.selectedBoard?.fqbn,
+      getData: (fqbn) => this.boardsDataStore.getData(fqbn),
+      loadBoardDetails: (fqbn) => this.boardsDataStore.loadBoardDetails(fqbn),
+      selectProgrammer: (arg) => this.boardsDataStore.selectProgrammer(arg),
+    });
+  }
+}
+
+interface EnsureProgrammerIsSelectedParams {
+  fqbn: string | undefined;
+  getData: (fqbn: string | undefined) => MaybePromise<BoardsDataStore.Data>;
+  loadBoardDetails: (fqbn: string) => MaybePromise<BoardDetails | undefined>;
+  selectProgrammer(options: {
+    fqbn: string;
+    selectedProgrammer: Programmer;
+  }): MaybePromise<boolean>;
+}
+
+export async function ensureProgrammerIsSelected(
+  params: EnsureProgrammerIsSelectedParams
+): Promise<boolean> {
+  const { fqbn, getData, loadBoardDetails, selectProgrammer } = params;
+  if (!fqbn) {
+    return false;
+  }
+  console.debug(`Ensuring a programmer is selected for ${fqbn}...`);
+  const data = await getData(fqbn);
+  if (isEmptyData(data)) {
+    // For example, the platform is not installed.
+    console.debug(`Skipping. No boards data is available for ${fqbn}.`);
+    return false;
+  }
+  if (data.selectedProgrammer) {
+    console.debug(
+      `A programmer is already selected for ${fqbn}: '${data.selectedProgrammer.id}'.`
+    );
+    return true;
+  }
+  let programmer = findDefaultProgrammer(data.programmers, data);
+  if (programmer) {
+    // select the programmer if the default info is available
+    const result = await selectProgrammer({
+      fqbn,
+      selectedProgrammer: programmer,
+    });
+    if (result) {
+      console.debug(`Selected '${programmer.id}' programmer for ${fqbn}.`);
+      return result;
+    }
+  }
+  console.debug(`Reloading board details for ${fqbn}...`);
+  const reloadedData = await loadBoardDetails(fqbn);
+  if (!reloadedData) {
+    console.debug(`Skipping. No board details found for ${fqbn}.`);
+    return false;
+  }
+  if (!reloadedData.programmers.length) {
+    console.debug(`Skipping. ${fqbn} does not have programmers.`);
+    return false;
+  }
+  programmer = findDefaultProgrammer(reloadedData.programmers, reloadedData);
+  if (!programmer) {
+    console.debug(
+      `Skipping. Could not find a default programmer for ${fqbn}. Programmers were: `
+    );
+    return false;
+  }
+  const result = await selectProgrammer({
+    fqbn,
+    selectedProgrammer: programmer,
+  });
+  if (result) {
+    console.debug(`Selected '${programmer.id}' programmer for ${fqbn}.`);
+  } else {
+    console.debug(
+      `Could not select '${programmer.id}' programmer for ${fqbn}.`
+    );
+  }
+  return result;
+}

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

@@ -1,58 +1,58 @@
-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,
+  DisposableCollection,
 } from '@theia/core/lib/common/disposable';
-import { BoardsConfig } from '../boards/boards-config';
+import { MenuModelRegistry } from '@theia/core/lib/common/menu/menu-model-registry';
+import type { MenuPath } from '@theia/core/lib/common/menu/menu-types';
+import { nls } from '@theia/core/lib/common/nls';
+import { Deferred } from '@theia/core/lib/common/promise-util';
+import { inject, injectable } from '@theia/core/shared/inversify';
 import { MainMenuManager } from '../../common/main-menu-manager';
+import {
+  BoardsService,
+  BoardWithPackage,
+  createPlatformIdentifier,
+  getBoardInfo,
+  InstalledBoardWithPackage,
+  platformIdentifierEquals,
+  Port,
+  serializePlatformIdentifier,
+} from '../../common/protocol';
+import type { BoardList } from '../../common/protocol/board-list';
 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,
-  getBoardInfo,
-} from '../../common/protocol';
-import { SketchContribution, Command, CommandRegistry } from './contribution';
-import { nls } from '@theia/core/lib/common';
+import { NotificationCenter } from '../notification-center';
+import { Command, CommandRegistry, SketchContribution } from './contribution';
 
 @injectable()
 export class BoardSelection extends SketchContribution {
   @inject(CommandRegistry)
-  protected readonly commandRegistry: CommandRegistry;
-
+  private readonly commandRegistry: CommandRegistry;
   @inject(MainMenuManager)
-  protected readonly mainMenuManager: MainMenuManager;
-
+  private readonly mainMenuManager: MainMenuManager;
   @inject(MenuModelRegistry)
-  protected readonly menuModelRegistry: MenuModelRegistry;
-
+  private readonly menuModelRegistry: MenuModelRegistry;
   @inject(NotificationCenter)
-  protected readonly notificationCenter: NotificationCenter;
-
+  private readonly notificationCenter: NotificationCenter;
   @inject(BoardsService)
-  protected readonly boardsService: BoardsService;
-
+  private readonly boardsService: BoardsService;
   @inject(BoardsServiceProvider)
-  protected readonly boardsServiceProvider: BoardsServiceProvider;
+  private readonly boardsServiceProvider: BoardsServiceProvider;
 
-  protected readonly toDisposeBeforeMenuRebuild = new DisposableCollection();
+  private readonly toDisposeBeforeMenuRebuild = new DisposableCollection();
+  // do not query installed platforms on every change
+  private _installedBoards: Deferred<InstalledBoardWithPackage[]> | undefined;
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(BoardSelection.Commands.GET_BOARD_INFO, {
       execute: async () => {
         const boardInfo = await getBoardInfo(
-          this.boardsServiceProvider.boardsConfig.selectedPort,
-          this.boardsService.getState()
+          this.boardsServiceProvider.boardList
         );
         if (typeof boardInfo === 'string') {
           this.messageService.info(boardInfo);
@@ -65,7 +65,7 @@ VID: ${VID}
 PID: ${PID}
 SN: ${SN}
 `.trim();
-        await remote.dialog.showMessageBox(remote.getCurrentWindow(), {
+        await this.dialogService.showMessageBox({
           message: nls.localize('arduino/board/boardInfo', 'Board Info'),
           title: nls.localize('arduino/board/boardInfo', 'Board Info'),
           type: 'info',
@@ -77,34 +77,35 @@ SN: ${SN}
   }
 
   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()
+    this.notificationCenter.onPlatformDidInstall(() => this.updateMenus(true));
+    this.notificationCenter.onPlatformDidUninstall(() =>
+      this.updateMenus(true)
     );
+    this.boardsServiceProvider.onBoardListDidChange(() => 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);
+  private async updateMenus(discardCache = false): Promise<void> {
+    if (discardCache) {
+      this._installedBoards?.reject();
+      this._installedBoards = undefined;
+    }
+    if (!this._installedBoards) {
+      this._installedBoards = new Deferred();
+      this.installedBoards().then((installedBoards) =>
+        this._installedBoards?.resolve(installedBoards)
+      );
+    }
+    const installedBoards = await this._installedBoards.promise;
+    this.rebuildMenus(installedBoards, this.boardsServiceProvider.boardList);
   }
 
-  protected rebuildMenus(
+  private rebuildMenus(
     installedBoards: InstalledBoardWithPackage[],
-    availablePorts: AvailablePorts,
-    config: BoardsConfig.Config
+    boardList: BoardList
   ): void {
     this.toDisposeBeforeMenuRebuild.dispose();
 
@@ -113,7 +114,8 @@ SN: ${SN}
       ...ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP,
       '1_boards',
     ];
-    const boardsSubmenuLabel = config.selectedBoard?.name;
+    const { selectedBoard, selectedPort } = boardList.boardsConfig;
+    const boardsSubmenuLabel = 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(
@@ -133,7 +135,7 @@ SN: ${SN}
 
     // Ports submenu
     const portsSubmenuPath = ArduinoMenus.TOOLS__PORTS_SUBMENU;
-    const portsSubmenuLabel = config.selectedPort?.address;
+    const portsSubmenuLabel = selectedPort?.address;
     this.menuModelRegistry.registerSubmenu(
       portsSubmenuPath,
       nls.localize(
@@ -172,45 +174,85 @@ SN: ${SN}
       label: `${BoardsListWidget.WIDGET_LABEL}...`,
     });
 
-    // Installed boards
-    installedBoards.forEach((board, index) => {
-      const { packageId, packageName, fqbn, name, manuallyInstalled } = board;
+    const selectedBoardPlatformId = selectedBoard
+      ? createPlatformIdentifier(selectedBoard)
+      : undefined;
 
-      const packageLabel =
+    // Keys are the vendor IDs
+    type BoardsPerVendor = Record<string, BoardWithPackage[]>;
+    // Group boards by their platform names. The keys are the platform names as menu labels.
+    // If there is a platform name (menu label) collision, refine the menu label with the vendor ID.
+    const groupedBoards = new Map<string, BoardsPerVendor>();
+    for (const board of installedBoards) {
+      const { packageId, packageName } = board;
+      const { vendorId } = packageId;
+      let boardsPerPackageName = groupedBoards.get(packageName);
+      if (!boardsPerPackageName) {
+        boardsPerPackageName = {} as BoardsPerVendor;
+        groupedBoards.set(packageName, boardsPerPackageName);
+      }
+      let boardPerVendor: BoardWithPackage[] | undefined =
+        boardsPerPackageName[vendorId];
+      if (!boardPerVendor) {
+        boardPerVendor = [];
+        boardsPerPackageName[vendorId] = boardPerVendor;
+      }
+      boardPerVendor.push(board);
+    }
+
+    // Installed boards
+    Array.from(groupedBoards.entries()).forEach(
+      ([packageName, boardsPerPackage]) => {
+        const useVendorSuffix = Object.keys(boardsPerPackage).length > 1;
+        Object.entries(boardsPerPackage).forEach(([vendorId, boards]) => {
+          let platformMenuPath: MenuPath | undefined = undefined;
+          boards.forEach((board, index) => {
+            const { packageId, fqbn, name, manuallyInstalled } = board;
+            // create the platform submenu once.
+            // creating and registering the same submenu twice in Theia is a noop, though.
+            if (!platformMenuPath) {
+              let packageLabel =
                 packageName +
                 `${
                   manuallyInstalled
-            ? nls.localize('arduino/board/inSketchbook', ' (in Sketchbook)')
+                    ? nls.localize(
+                        'arduino/board/inSketchbook',
+                        ' (in Sketchbook)'
+                      )
                     : ''
                 }`;
+              if (
+                selectedBoardPlatformId &&
+                platformIdentifierEquals(packageId, selectedBoardPlatformId)
+              ) {
+                packageLabel = `● ${packageLabel}`;
+              }
+              if (useVendorSuffix) {
+                packageLabel += ` (${vendorId})`;
+              }
               // 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, {
+              platformMenuPath = [
+                ...boardsPackagesGroup,
+                serializePlatformIdentifier(packageId),
+              ];
+              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,
+              execute: () =>
+                this.boardsServiceProvider.updateConfig({
+                  name: name,
+                  fqbn: fqbn,
+                }),
+              isToggled: () => fqbn === selectedBoard?.fqbn,
             };
 
             // Board menu
@@ -221,20 +263,27 @@ SN: ${SN}
             };
             this.commandRegistry.registerCommand(command, handler);
             this.toDisposeBeforeMenuRebuild.push(
-        Disposable.create(() => this.commandRegistry.unregisterCommand(command))
+              Disposable.create(() =>
+                this.commandRegistry.unregisterCommand(command)
+              )
+            );
+            this.menuModelRegistry.registerMenuAction(
+              platformMenuPath,
+              menuAction
             );
-      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
+    // Detected ports
     const registerPorts = (
       protocol: string,
-      protocolOrder: number,
-      ports: AvailablePorts
+      ports: ReturnType<BoardList['ports']>,
+      protocolOrder: number
     ) => {
-      const portIDs = Object.keys(ports);
-      if (!portIDs.length) {
+      if (!ports.length) {
         return;
       }
 
@@ -259,46 +308,26 @@ SN: ${SN}
         )
       );
 
-      // 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];
+      for (let i = 0; i < ports.length; i++) {
+        const { port, boards } = ports[i];
+        const portKey = Port.keyOf(port);
         let label = `${port.addressLabel}`;
-        if (boards.length) {
+        if (boards?.length) {
           const boardsList = boards.map((board) => board.name).join(', ');
           label = `${label} (${boardsList})`;
         }
-        const id = `arduino-select-port--${portID}`;
+        const id = `arduino-select-port--${portKey}`;
         const command = { id };
         const handler = {
           execute: () => {
-            if (
-              !Port.sameAs(
-                port,
-                this.boardsServiceProvider.boardsConfig.selectedPort
-              )
-            ) {
-              this.boardsServiceProvider.boardsConfig = {
-                selectedBoard:
-                  this.boardsServiceProvider.boardsConfig.selectedBoard,
-                selectedPort: port,
-              };
-            }
+            this.boardsServiceProvider.updateConfig({
+              protocol: port.protocol,
+              address: port.address,
+            });
+          },
+          isToggled: () => {
+            return i === ports.matchingIndex;
           },
-          isToggled: () =>
-            Port.sameAs(
-              port,
-              this.boardsServiceProvider.boardsConfig.selectedPort
-            ),
         };
         const menuAction = {
           commandId: id,
@@ -315,22 +344,12 @@ SN: ${SN}
       }
     };
 
-    const grouped = AvailablePorts.groupByProtocol(availablePorts);
+    const groupedPorts = boardList.portsGroupedByProtocol();
     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;
-      }
+    Object.entries(groupedPorts).forEach(([protocol, ports]) => {
+      registerPorts(protocol, ports, protocolOrder);
+      protocolOrder += 100;
     });
-    grouped.forEach((ports, protocol) => {
-      registerPorts(protocol, protocolOrder, ports);
-      protocolOrder = protocolOrder + 100;
-    });
-
     this.mainMenuManager.update();
   }
 

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

@@ -1,67 +1,66 @@
-import * as PQueue from 'p-queue';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { CommandRegistry } from '@theia/core/lib/common/command';
-import { MenuModelRegistry } from '@theia/core/lib/common/menu';
 import {
   Disposable,
   DisposableCollection,
 } from '@theia/core/lib/common/disposable';
-import { BoardsServiceProvider } from './boards-service-provider';
-import { Board, ConfigOption, Programmer } from '../../common/protocol';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser';
-import { BoardsDataStore } from './boards-data-store';
-import { MainMenuManager } from '../../common/main-menu-manager';
+import { nls } from '@theia/core/lib/common/nls';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import PQueue from 'p-queue';
+import {
+  BoardIdentifier,
+  ConfigOption,
+  isBoardIdentifierChangeEvent,
+  Programmer,
+} from '../../common/protocol';
+import { BoardsDataStore } from '../boards/boards-data-store';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
 import { ArduinoMenus, unregisterSubmenu } from '../menu/arduino-menus';
-import { nls } from '@theia/core/lib/common';
-import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import {
+  CommandRegistry,
+  Contribution,
+  MenuModelRegistry,
+} from './contribution';
 
 @injectable()
-export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
+export class BoardsDataMenuUpdater extends Contribution {
   @inject(CommandRegistry)
-  protected readonly commandRegistry: CommandRegistry;
-
+  private readonly commandRegistry: CommandRegistry;
   @inject(MenuModelRegistry)
-  protected readonly menuRegistry: MenuModelRegistry;
-
-  @inject(MainMenuManager)
-  protected readonly mainMenuManager: MainMenuManager;
-
+  private readonly menuRegistry: MenuModelRegistry;
   @inject(BoardsDataStore)
-  protected readonly boardsDataStore: BoardsDataStore;
-
+  private readonly boardsDataStore: BoardsDataStore;
   @inject(BoardsServiceProvider)
-  protected readonly boardsServiceClient: BoardsServiceProvider;
+  private readonly boardsServiceProvider: BoardsServiceProvider;
 
-  @inject(FrontendApplicationStateService)
-  private readonly appStateService: FrontendApplicationStateService;
+  private readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
+  private readonly toDisposeOnBoardChange = new DisposableCollection();
 
-  protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
-  protected readonly toDisposeOnBoardChange = new DisposableCollection();
-
-  async onStart(): Promise<void> {
-    this.appStateService
-      .reachedState('ready')
-      .then(() =>
+  override onStart(): void {
+    this.boardsDataStore.onDidChange(() =>
       this.updateMenuActions(
-          this.boardsServiceClient.boardsConfig.selectedBoard
+        this.boardsServiceProvider.boardsConfig.selectedBoard
       )
     );
-    this.boardsDataStore.onChanged(() =>
+    this.boardsServiceProvider.onBoardsConfigDidChange((event) => {
+      if (isBoardIdentifierChangeEvent(event)) {
+        this.updateMenuActions(event.selectedBoard);
+      }
+    });
+  }
+
+  override onReady(): void {
+    this.boardsServiceProvider.ready.then(() =>
       this.updateMenuActions(
-        this.boardsServiceClient.boardsConfig.selectedBoard
+        this.boardsServiceProvider.boardsConfig.selectedBoard
       )
     );
-    this.boardsServiceClient.onBoardsConfigChanged(({ selectedBoard }) =>
-      this.updateMenuActions(selectedBoard)
-    );
   }
 
-  protected async updateMenuActions(
-    selectedBoard: Board | undefined
+  private async updateMenuActions(
+    selectedBoard: BoardIdentifier | undefined
   ): Promise<void> {
     return this.queue.add(async () => {
       this.toDisposeOnBoardChange.dispose();
-      this.mainMenuManager.update();
+      this.menuManager.update();
       if (selectedBoard) {
         const { fqbn } = selectedBoard;
         if (fqbn) {
@@ -172,7 +171,7 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
               ]);
             }
           }
-          this.mainMenuManager.update();
+          this.menuManager.update();
         }
       }
     });

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

@@ -1,26 +1,26 @@
-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 { Dialog } from '@theia/core/lib/browser/dialogs';
 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 { nls } from '@theia/core/lib/common/nls';
+import type { MaybePromise } from '@theia/core/lib/common/types';
+import { toArray } from '@theia/core/shared/@phosphor/algorithm';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
 import { ArduinoMenus } from '../menu/arduino-menus';
+import { CurrentSketch } from '../sketches-service-client-impl';
+import { WindowServiceExt } from '../theia/core/window-service-ext';
 import {
-  SketchContribution,
   Command,
   CommandRegistry,
-  MenuModelRegistry,
   KeybindingRegistry,
+  MenuModelRegistry,
   Sketch,
+  SketchContribution,
   URI,
 } from './contribution';
-import { Dialog } from '@theia/core/lib/browser/dialogs';
-import { CurrentSketch } from '../sketches-service-client-impl';
 import { SaveAsSketch } from './save-as-sketch';
 
 /**
@@ -28,6 +28,9 @@ import { SaveAsSketch } from './save-as-sketch';
  */
 @injectable()
 export class Close extends SketchContribution {
+  @inject(WindowServiceExt)
+  private readonly windowServiceExt: WindowServiceExt;
+
   private shell: ApplicationShell | undefined;
 
   override onStart(app: FrontendApplication): MaybePromise<void> {
@@ -56,7 +59,7 @@ export class Close extends SketchContribution {
             }
           }
         }
-        return remote.getCurrentWindow().close();
+        return this.windowServiceExt.close();
       },
     });
   }
@@ -150,9 +153,7 @@ export class Close extends SketchContribution {
   }
 
   private async prompt(isTemp: boolean): Promise<Prompt> {
-    const { response } = await remote.dialog.showMessageBox(
-      remote.getCurrentWindow(),
-      {
+    const { response } = await this.dialogService.showMessageBox({
       message: nls.localize(
         'arduino/sketch/saveSketch',
         'Save your sketch to open it again later.'
@@ -168,8 +169,7 @@ export class Close extends SketchContribution {
         nls.localizeByDefault(isTemp ? 'Save As...' : 'Save'),
       ],
       defaultId: 2, // `Save`/`Save As...` button index is the default.
-      }
-    );
+    });
     switch (response) {
       case 0:
         return Prompt.DoNotSave;

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

@@ -6,6 +6,10 @@ import {
 } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { ILogger } from '@theia/core/lib/common/logger';
+import {
+  Disposable,
+  DisposableCollection,
+} from '@theia/core/lib/common/disposable';
 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';
@@ -62,6 +66,9 @@ import { MessageType } from '@theia/core/lib/common/message-service-protocol';
 import { WorkspaceService } from '../theia/workspace/workspace-service';
 import { MainMenuManager } from '../../common/main-menu-manager';
 import { ConfigServiceClient } from '../config/config-service-client';
+import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
+import { DialogService } from '../dialog-service';
+import { ApplicationConnectionStatusContribution } from '../theia/core/connection-status-service';
 
 export {
   Command,
@@ -110,6 +117,9 @@ export abstract class Contribution
   @inject(MainMenuManager)
   protected readonly menuManager: MainMenuManager;
 
+  @inject(DialogService)
+  protected readonly dialogService: DialogService;
+
   @postConstruct()
   protected init(): void {
     this.appStateService.reachedState('ready').then(() => this.onReady());
@@ -163,6 +173,9 @@ export abstract class SketchContribution extends Contribution {
   @inject(EnvVariablesServer)
   protected readonly envVariableServer: EnvVariablesServer;
 
+  @inject(ApplicationConnectionStatusContribution)
+  protected readonly connectionStatusService: ApplicationConnectionStatusContribution;
+
   protected async sourceOverride(): Promise<Record<string, string>> {
     const override: Record<string, string> = {};
     const sketch = await this.sketchServiceClient.currentSketch();
@@ -217,6 +230,9 @@ export abstract class CoreServiceContribution extends SketchContribution {
   @inject(NotificationManager)
   private readonly notificationManager: NotificationManager;
 
+  @inject(ApplicationShell)
+  private readonly shell: ApplicationShell;
+
   /**
    * 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.)
@@ -279,6 +295,9 @@ export abstract class CoreServiceContribution extends SketchContribution {
     keepOutput?: boolean;
     task: (progressId: string, coreService: CoreService) => Promise<T>;
   }): Promise<T> {
+    const toDisposeOnComplete = new DisposableCollection(
+      this.maybeActivateMonitorWidget()
+    );
     const { progressText, keepOutput, task } = options;
     this.outputChannelManager
       .getChannel('Arduino')
@@ -290,9 +309,24 @@ export abstract class CoreServiceContribution extends SketchContribution {
       run: ({ progressId }) => task(progressId, this.coreService),
       keepOutput,
     });
+    toDisposeOnComplete.dispose();
     return result;
   }
 
+  // TODO: cleanup!
+  // this dependency does not belong here
+  // support core command contribution handlers, the monitor-widget should implement it and register itself as a handler
+  // the monitor widget should reveal itself after a successful core command execution
+  private maybeActivateMonitorWidget(): Disposable {
+    const currentWidget = this.shell.bottomPanel.currentTitle?.owner;
+    if (currentWidget?.id === 'serial-monitor') {
+      return Disposable.create(() =>
+        this.shell.bottomPanel.activateWidget(currentWidget)
+      );
+    }
+    return Disposable.NULL;
+  }
+
   private notificationId(message: string, ...actions: string[]): string {
     return this.notificationManager['getMessageId']({
       text: message,

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

@@ -1,102 +1,173 @@
+import { Emitter, Event } from '@theia/core/lib/common/event';
+import { MenuModelRegistry } from '@theia/core/lib/common/menu/menu-model-registry';
+import { nls } from '@theia/core/lib/common/nls';
+import { MaybePromise } from '@theia/core/lib/common/types';
 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 { noBoardSelected } from '../../common/nls';
 import {
-  Board,
+  BoardDetails,
+  BoardIdentifier,
   BoardsService,
+  CheckDebugEnabledParams,
   ExecutableService,
-  Sketch,
+  SketchRef,
+  isBoardIdentifierChangeEvent,
+  isCompileSummary,
 } from '../../common/protocol';
+import { BoardsDataStore } from '../boards/boards-data-store';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import { HostedPluginSupport } from '../hosted/hosted-plugin-support';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import { NotificationCenter } from '../notification-center';
+import { CurrentSketch } from '../sketches-service-client-impl';
+import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import {
-  URI,
   Command,
   CommandRegistry,
   SketchContribution,
   TabBarToolbarRegistry,
+  URI,
 } from './contribution';
-import { MaybePromise, MenuModelRegistry, nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../sketches-service-client-impl';
-import { ArduinoMenus } from '../menu/arduino-menus';
 
 const COMPILE_FOR_DEBUG_KEY = 'arduino-compile-for-debug';
 
+interface StartDebugParams {
+  /**
+   * Absolute filesystem path to the Arduino CLI executable.
+   */
+  readonly cliPath: string;
+  /**
+   * The the board to debug.
+   */
+  readonly board: Readonly<{ fqbn: string; name?: string }>;
+  /**
+   * Absolute filesystem path of the sketch to debug.
+   */
+  readonly sketchPath: string;
+  /**
+   * Location where the `launch.json` will be created on the fly before starting every debug session.
+   * If not defined, it falls back to `sketchPath/.vscode/launch.json`.
+   */
+  readonly launchConfigsDirPath?: string;
+  /**
+   * Absolute path to the `arduino-cli.yaml` file. If not specified, it falls back to `~/.arduinoIDE/arduino-cli.yaml`.
+   */
+  readonly cliConfigPath?: string;
+  /**
+   * Programmer for the debugging.
+   */
+  readonly programmer?: string;
+  /**
+   * Custom progress title to use when getting the debug information from the CLI.
+   */
+  readonly title?: string;
+}
+type StartDebugResult = boolean;
+
+export const DebugDisabledStatusMessageSource = Symbol(
+  'DebugDisabledStatusMessageSource'
+);
+export interface DebugDisabledStatusMessageSource {
+  /**
+   * `undefined` if debugging is enabled (for the currently selected board + programmer + config options).
+   * Otherwise, it's the human readable message why it's disabled.
+   */
+  get message(): string | undefined;
+  /**
+   * Emits an event when {@link message} changes.
+   */
+  get onDidChangeMessage(): Event<string | undefined>;
+}
+
 @injectable()
-export class Debug extends SketchContribution {
+export class Debug
+  extends SketchContribution
+  implements DebugDisabledStatusMessageSource
+{
   @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(BoardsDataStore)
+  private readonly boardsDataStore: BoardsDataStore;
 
   /**
-   * If `undefined`, debugging is enabled. Otherwise, the reason why it's disabled.
+   * If `undefined`, debugging is enabled. Otherwise, the human-readable 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 _message?: string = noBoardSelected; // Initial pessimism.
+  private readonly didChangeMessageEmitter = new Emitter<string | undefined>();
+  readonly onDidChangeMessage = this.didChangeMessageEmitter.event;
 
-  private get disabledMessage(): string | undefined {
-    return this._disabledMessages;
+  get message(): string | undefined {
+    return this._message;
   }
-  private set disabledMessage(message: string | undefined) {
-    this._disabledMessages = message;
-    this.disabledMessageDidChangeEmitter.fire(this._disabledMessages);
+  private set message(message: string | undefined) {
+    this._message = message;
+    this.didChangeMessageEmitter.fire(this._message);
   }
 
   private readonly debugToolbarItem = {
     id: Debug.Commands.START_DEBUGGING.id,
     command: Debug.Commands.START_DEBUGGING.id,
     tooltip: `${
-      this.disabledMessage
+      this.message
         ? nls.localize(
             'arduino/debug/debugWithMessage',
             'Debug - {0}',
-            this.disabledMessage
+            this.message
           )
         : Debug.Commands.START_DEBUGGING.label
     }`,
     priority: 3,
-    onDidChange: this.onDisabledMessageDidChange as Event<void>,
+    onDidChange: this.onDidChangeMessage as Event<void>,
   };
 
   override onStart(): void {
-    this.onDisabledMessageDidChange(
+    this.onDidChangeMessage(
       () =>
         (this.debugToolbarItem.tooltip = `${
-          this.disabledMessage
+          this.message
             ? nls.localize(
                 'arduino/debug/debugWithMessage',
                 'Debug - {0}',
-                this.disabledMessage
+                this.message
               )
             : Debug.Commands.START_DEBUGGING.label
         }`)
     );
-    this.boardsServiceProvider.onBoardsConfigChanged(({ selectedBoard }) =>
-      this.refreshState(selectedBoard)
-    );
-    this.notificationCenter.onPlatformDidInstall(() => this.refreshState());
-    this.notificationCenter.onPlatformDidUninstall(() => this.refreshState());
+    this.boardsServiceProvider.onBoardsConfigDidChange((event) => {
+      if (isBoardIdentifierChangeEvent(event)) {
+        this.updateMessage();
+      }
+    });
+    this.notificationCenter.onPlatformDidInstall(() => this.updateMessage());
+    this.notificationCenter.onPlatformDidUninstall(() => this.updateMessage());
+    this.boardsDataStore.onDidChange((event) => {
+      const selectedFqbn =
+        this.boardsServiceProvider.boardsConfig.selectedBoard?.fqbn;
+      if (event.changes.find((change) => change.fqbn === selectedFqbn)) {
+        this.updateMessage();
+      }
+    });
+    this.commandService.onDidExecuteCommand((event) => {
+      const { commandId, args } = event;
+      if (
+        commandId === 'arduino.languageserver.notifyBuildDidComplete' &&
+        isCompileSummary(args[0])
+      ) {
+        this.updateMessage();
+      }
+    });
   }
 
-  override onReady(): MaybePromise<void> {
-    this.refreshState();
+  override onReady(): void {
+    this.boardsServiceProvider.ready.then(() => this.updateMessage());
   }
 
   override registerCommands(registry: CommandRegistry): void {
@@ -104,7 +175,7 @@ export class Debug extends SketchContribution {
       execute: () => this.startDebug(),
       isVisible: (widget) =>
         ArduinoToolbar.is(widget) && widget.side === 'left',
-      isEnabled: () => !this.disabledMessage,
+      isEnabled: () => !this.message,
     });
     registry.registerCommand(Debug.Commands.TOGGLE_OPTIMIZE_FOR_DEBUG, {
       execute: () => this.toggleCompileForDebug(),
@@ -127,94 +198,56 @@ export class Debug extends SketchContribution {
     });
   }
 
-  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;
+  private async updateMessage(): Promise<void> {
+    try {
+      await this.isDebugEnabled();
+      this.message = undefined;
+    } catch (err) {
+      let message = String(err);
+      if (err instanceof Error) {
+        message = err.message;
       }
-    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;
+      this.message = message;
     }
   }
 
-  private async startDebug(
-    board: Board | undefined = this.boardsServiceProvider.boardsConfig
+  private async isDebugEnabled(
+    board: BoardIdentifier | undefined = this.boardsServiceProvider.boardsConfig
       .selectedBoard
-  ): Promise<void> {
-    if (!board) {
-      return;
+  ): Promise<string> {
+    const debugFqbn = await isDebugEnabled(
+      board,
+      (fqbn) => this.boardService.getBoardDetails({ fqbn }),
+      (fqbn) => this.boardsDataStore.getData(fqbn),
+      (fqbn) => this.boardsDataStore.appendConfigToFqbn(fqbn),
+      (params) => this.boardService.checkDebugEnabled(params)
+    );
+    return debugFqbn;
   }
-    const { name, fqbn } = board;
-    if (!fqbn) {
-      return;
+
+  private async startDebug(
+    board: BoardIdentifier | undefined = this.boardsServiceProvider.boardsConfig
+      .selectedBoard,
+    sketch:
+      | CurrentSketch
+      | undefined = this.sketchServiceClient.tryGetCurrentSketch()
+  ): Promise<StartDebugResult> {
+    if (!CurrentSketch.isValid(sketch)) {
+      return false;
+    }
+    const params = await this.createStartDebugParams(board);
+    if (!params) {
+      return false;
     }
     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.sketchesService.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,
-    };
     try {
-      await this.commandService.executeCommand('arduino.debug.start', config);
+      const result = await this.debug(params);
+      return Boolean(result);
     } catch (err) {
       if (await this.isSketchNotVerifiedError(err, sketch)) {
         const yes = nls.localize('vscode/extensionsUtils/yes', 'Yes');
         const answer = await this.messageService.error(
-          nls.localize(
-            'arduino/debug/sketchIsNotCompiled',
-            "Sketch '{0}' must be verified before starting a debug session. Please verify the sketch and start debugging again. Do you want to verify the sketch now?",
-            sketch.name
-          ),
+          sketchIsNotCompiled(sketch.name),
           yes
         );
         if (answer === yes) {
@@ -226,6 +259,16 @@ export class Debug extends SketchContribution {
         );
       }
     }
+    return false;
+  }
+
+  private async debug(
+    params: StartDebugParams
+  ): Promise<StartDebugResult | undefined> {
+    return this.commandService.executeCommand<StartDebugResult>(
+      'arduino.debug.start',
+      params
+    );
   }
 
   get compileForDebug(): boolean {
@@ -233,7 +276,7 @@ export class Debug extends SketchContribution {
     return value === 'true';
   }
 
-  async toggleCompileForDebug(): Promise<void> {
+  private toggleCompileForDebug(): void {
     const oldState = this.compileForDebug;
     const newState = !oldState;
     window.localStorage.setItem(COMPILE_FOR_DEBUG_KEY, String(newState));
@@ -242,7 +285,7 @@ export class Debug extends SketchContribution {
 
   private async isSketchNotVerifiedError(
     err: unknown,
-    sketch: Sketch
+    sketch: SketchRef
   ): Promise<boolean> {
     if (err instanceof Error) {
       try {
@@ -256,6 +299,48 @@ export class Debug extends SketchContribution {
     }
     return false;
   }
+
+  private async createStartDebugParams(
+    board: BoardIdentifier | undefined
+  ): Promise<StartDebugParams | undefined> {
+    if (!board || !board.fqbn) {
+      return undefined;
+    }
+    let debugFqbn: string | undefined = undefined;
+    try {
+      debugFqbn = await this.isDebugEnabled(board);
+    } catch {}
+    if (!debugFqbn) {
+      return undefined;
+    }
+    const [sketch, executables, boardsData] = await Promise.all([
+      this.sketchServiceClient.currentSketch(),
+      this.executableService.list(),
+      this.boardsDataStore.getData(board.fqbn),
+    ]);
+    if (!CurrentSketch.isValid(sketch)) {
+      return undefined;
+    }
+    const ideTempFolderUri = await this.sketchesService.getIdeTempFolderUri(
+      sketch
+    );
+    const [cliPath, sketchPath, launchConfigsDirPath] = await Promise.all([
+      this.fileService.fsPath(new URI(executables.cliUri)),
+      this.fileService.fsPath(new URI(sketch.uri)),
+      this.fileService.fsPath(new URI(ideTempFolderUri)),
+    ]);
+    return {
+      board: { fqbn: debugFqbn, name: board.name },
+      cliPath,
+      sketchPath,
+      launchConfigsDirPath,
+      programmer: boardsData.selectedProgrammer?.id,
+      title: nls.localize(
+        'arduino/debug/getDebugInfo',
+        'Getting debug info...'
+      ),
+    };
+  }
 }
 export namespace Debug {
   export namespace Commands {
@@ -280,3 +365,91 @@ export namespace Debug {
     };
   }
 }
+
+/**
+ * Resolves with the FQBN to use for the `debug --info --programmer p --fqbn $FQBN` command. Otherwise, rejects.
+ *
+ * (non-API)
+ */
+export async function isDebugEnabled(
+  board: BoardIdentifier | undefined,
+  getDetails: (fqbn: string) => MaybePromise<BoardDetails | undefined>,
+  getData: (fqbn: string) => MaybePromise<BoardsDataStore.Data>,
+  appendConfigToFqbn: (fqbn: string) => MaybePromise<string | undefined>,
+  checkDebugEnabled: (params: CheckDebugEnabledParams) => MaybePromise<string>
+): Promise<string> {
+  if (!board) {
+    throw new Error(noBoardSelected);
+  }
+  const { fqbn } = board;
+  if (!fqbn) {
+    throw new Error(noPlatformInstalledFor(board.name));
+  }
+  const [details, data, fqbnWithConfig] = await Promise.all([
+    getDetails(fqbn),
+    getData(fqbn),
+    appendConfigToFqbn(fqbn),
+  ]);
+  if (!details) {
+    throw new Error(noPlatformInstalledFor(board.name));
+  }
+  if (!fqbnWithConfig) {
+    throw new Error(
+      `Failed to append boards config to the FQBN. Original FQBN was: ${fqbn}`
+    );
+  }
+  if (!data.selectedProgrammer) {
+    throw new Error(noProgrammerSelectedFor(board.name));
+  }
+  const params = {
+    fqbn: fqbnWithConfig,
+    programmer: data.selectedProgrammer.id,
+  };
+  try {
+    const debugFqbn = await checkDebugEnabled(params);
+    return debugFqbn;
+  } catch (err) {
+    throw new Error(debuggingNotSupported(board.name));
+  }
+}
+
+/**
+ * (non-API)
+ */
+export function sketchIsNotCompiled(sketchName: string): string {
+  return nls.localize(
+    'arduino/debug/sketchIsNotCompiled',
+    "Sketch '{0}' must be verified before starting a debug session. Please verify the sketch and start debugging again. Do you want to verify the sketch now?",
+    sketchName
+  );
+}
+/**
+ * (non-API)
+ */
+export function noPlatformInstalledFor(boardName: string): string {
+  return nls.localize(
+    'arduino/debug/noPlatformInstalledFor',
+    "Platform is not installed for '{0}'",
+    boardName
+  );
+}
+/**
+ * (non-API)
+ */
+export function debuggingNotSupported(boardName: string): string {
+  return nls.localize(
+    'arduino/debug/debuggingNotSupported',
+    "Debugging is not supported by '{0}'",
+    boardName
+  );
+}
+/**
+ * (non-API)
+ */
+export function noProgrammerSelectedFor(boardName: string): string {
+  return nls.localize(
+    'arduino/debug/noProgrammerSelectedFor',
+    "No programmer selected for '{0}'",
+    boardName
+  );
+}

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

@@ -1,5 +1,3 @@
-import * as remote from '@theia/core/electron-shared/@electron/remote';
-import { ipcRenderer } from '@theia/core/electron-shared/electron';
 import { Dialog } from '@theia/core/lib/browser/dialogs';
 import { NavigatableWidget } from '@theia/core/lib/browser/navigatable-types';
 import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
@@ -10,11 +8,11 @@ import URI from '@theia/core/lib/common/uri';
 import type { Widget } from '@theia/core/shared/@phosphor/widgets';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { SketchesError } from '../../common/protocol';
-import { SCHEDULE_DELETION_SIGNAL } from '../../electron-common/electron-messages';
 import { Sketch } from '../contributions/contribution';
 import { isNotFound } from '../create/typings';
 import { Command, CommandRegistry } from './contribution';
 import { CloudSketchContribution } from './cloud-contribution';
+import { AppService } from '../app-service';
 
 export interface DeleteSketchParams {
   /**
@@ -38,6 +36,8 @@ export class DeleteSketch extends CloudSketchContribution {
   private readonly shell: ApplicationShell;
   @inject(WindowService)
   private readonly windowService: WindowService;
+  @inject(AppService)
+  private readonly appService: AppService;
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(DeleteSketch.Commands.DELETE_SKETCH, {
@@ -66,7 +66,7 @@ export class DeleteSketch extends CloudSketchContribution {
     }
     const cloudUri = this.createFeatures.cloudUri(sketch);
     if (willNavigateAway !== 'force') {
-      const { response } = await remote.dialog.showMessageBox({
+      const { response } = await this.dialogService.showMessageBox({
         title: nls.localizeByDefault('Delete'),
         type: 'question',
         buttons: [Dialog.CANCEL, Dialog.OK],
@@ -120,7 +120,7 @@ export class DeleteSketch extends CloudSketchContribution {
   }
 
   private scheduleDeletion(sketch: Sketch): void {
-    ipcRenderer.send(SCHEDULE_DELETION_SIGNAL, sketch);
+    this.appService.scheduleDeletion(sketch);
   }
 
   private async loadSketch(uri: string): Promise<Sketch | undefined> {

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

@@ -1,11 +1,7 @@
-import * as PQueue from 'p-queue';
+import PQueue from 'p-queue';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { CommandHandler, CommandService } from '@theia/core/lib/common/command';
-import {
-  MenuPath,
-  CompositeMenuNode,
-  SubMenuOptions,
-} from '@theia/core/lib/common/menu';
+import { MenuPath, SubMenuOptions } from '@theia/core/lib/common/menu';
 import {
   Disposable,
   DisposableCollection,
@@ -32,6 +28,8 @@ import {
   CoreService,
   SketchesService,
   Sketch,
+  isBoardIdentifierChangeEvent,
+  BoardIdentifier,
 } from '../../common/protocol';
 import { nls } from '@theia/core/lib/common/nls';
 import { unregisterSubmenu } from '../menu/arduino-menus';
@@ -112,7 +110,7 @@ export abstract class Examples extends SketchContribution {
   protected readonly coreService: CoreService;
 
   @inject(BoardsServiceProvider)
-  protected readonly boardsServiceClient: BoardsServiceProvider;
+  protected readonly boardsServiceProvider: BoardsServiceProvider;
 
   @inject(NotificationCenter)
   protected readonly notificationCenter: NotificationCenter;
@@ -121,12 +119,14 @@ export abstract class Examples extends SketchContribution {
 
   protected override init(): void {
     super.init();
-    this.boardsServiceClient.onBoardsConfigChanged(({ selectedBoard }) =>
-      this.handleBoardChanged(selectedBoard)
-    );
+    this.boardsServiceProvider.onBoardsConfigDidChange((event) => {
+      if (isBoardIdentifierChangeEvent(event)) {
+        this.handleBoardChanged(event.selectedBoard);
+      }
+    });
     this.notificationCenter.onDidReinitialize(() =>
       this.update({
-        board: this.boardsServiceClient.boardsConfig.selectedBoard,
+        board: this.boardsServiceProvider.boardsConfig.selectedBoard,
         // No force refresh. The core client was already refreshed.
       })
     );
@@ -138,24 +138,11 @@ export abstract class Examples extends SketchContribution {
   }
 
   protected abstract update(options?: {
-    board?: Board | undefined;
+    board?: BoardIdentifier | 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(
@@ -242,7 +229,7 @@ export abstract class Examples extends SketchContribution {
   protected createHandler(uri: string): CommandHandler {
     const forceUpdate = () =>
       this.update({
-        board: this.boardsServiceClient.boardsConfig.selectedBoard,
+        board: this.boardsServiceProvider.boardsConfig.selectedBoard,
         forceRefresh: true,
       });
     return {
@@ -313,8 +300,8 @@ export class LibraryExamples extends Examples {
     this.notificationCenter.onLibraryDidUninstall(() => this.update());
   }
 
-  override async onReady(): Promise<void> {
-    this.update(); // no `await`
+  override onReady(): void {
+    this.boardsServiceProvider.ready.then(() => this.update());
   }
 
   protected override handleBoardChanged(board: Board | undefined): void {
@@ -323,7 +310,7 @@ export class LibraryExamples extends Examples {
 
   protected override async update(
     options: { board?: Board; forceRefresh?: boolean } = {
-      board: this.boardsServiceClient.boardsConfig.selectedBoard,
+      board: this.boardsServiceProvider.boardsConfig.selectedBoard,
     }
   ): Promise<void> {
     const { board, forceRefresh } = options;

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

@@ -1,8 +1,7 @@
-import * as PQueue from 'p-queue';
+import PQueue from 'p-queue';
 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,
@@ -22,31 +21,28 @@ import { CurrentSketch } from '../sketches-service-client-impl';
 @injectable()
 export class IncludeLibrary extends SketchContribution {
   @inject(CommandRegistry)
-  protected readonly commandRegistry: CommandRegistry;
+  private readonly commandRegistry: CommandRegistry;
 
   @inject(MenuModelRegistry)
-  protected readonly menuRegistry: MenuModelRegistry;
+  private readonly menuRegistry: MenuModelRegistry;
 
   @inject(MainMenuManager)
-  protected readonly mainMenuManager: MainMenuManager;
-
-  @inject(EditorManager)
-  protected override readonly editorManager: EditorManager;
+  private readonly mainMenuManager: MainMenuManager;
 
   @inject(NotificationCenter)
-  protected readonly notificationCenter: NotificationCenter;
+  private readonly notificationCenter: NotificationCenter;
 
   @inject(BoardsServiceProvider)
-  protected readonly boardsServiceClient: BoardsServiceProvider;
+  private readonly boardsServiceProvider: BoardsServiceProvider;
 
   @inject(LibraryService)
-  protected readonly libraryService: LibraryService;
+  private readonly libraryService: LibraryService;
 
-  protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
-  protected readonly toDispose = new DisposableCollection();
+  private readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
+  private readonly toDispose = new DisposableCollection();
 
   override onStart(): void {
-    this.boardsServiceClient.onBoardsConfigChanged(() =>
+    this.boardsServiceProvider.onBoardsConfigDidChange(() =>
       this.updateMenuActions()
     );
     this.notificationCenter.onLibraryDidInstall(() => this.updateMenuActions());
@@ -56,8 +52,8 @@ export class IncludeLibrary extends SketchContribution {
     this.notificationCenter.onDidReinitialize(() => this.updateMenuActions());
   }
 
-  override async onReady(): Promise<void> {
-    this.updateMenuActions();
+  override onReady(): void {
+    this.boardsServiceProvider.ready.then(() => this.updateMenuActions());
   }
 
   override registerMenus(registry: MenuModelRegistry): void {
@@ -93,12 +89,12 @@ export class IncludeLibrary extends SketchContribution {
     });
   }
 
-  protected async updateMenuActions(): Promise<void> {
+  private 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;
+      const fqbn = this.boardsServiceProvider.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 })));
@@ -139,7 +135,7 @@ export class IncludeLibrary extends SketchContribution {
     });
   }
 
-  protected registerLibrary(
+  private registerLibrary(
     libraryOrPlaceholder: LibraryPackage | string,
     menuPath: MenuPath
   ): Disposable {
@@ -172,7 +168,7 @@ export class IncludeLibrary extends SketchContribution {
     );
   }
 
-  protected async includeLibrary(library: LibraryPackage): Promise<void> {
+  private async includeLibrary(library: LibraryPackage): Promise<void> {
     const sketch = await this.sketchServiceClient.currentSketch();
     if (!CurrentSketch.isValid(sketch)) {
       return;

arduino-ide-extension/src/browser/contributions/ino-language.ts

@@ -1,41 +1,111 @@
-import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import {
+  Disposable,
+  DisposableCollection,
+} from '@theia/core/lib/common/disposable';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { Mutex } from 'async-mutex';
 import {
   ArduinoDaemon,
-  assertSanitizedFqbn,
+  BoardIdentifier,
   BoardsService,
   ExecutableService,
+  assertSanitizedFqbn,
+  isBoardIdentifierChangeEvent,
   sanitizeFqbn,
 } from '../../common/protocol';
-import { CurrentSketch } from '../sketches-service-client-impl';
-import { BoardsConfig } from '../boards/boards-config';
-import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import { HostedPluginEvents } from '../hosted-plugin-events';
-import { NotificationCenter } from '../notification-center';
-import { SketchContribution, URI } from './contribution';
+import {
+  defaultAsyncWorkers,
+  maxAsyncWorkers,
+  minAsyncWorkers,
+} from '../arduino-preferences';
 import { BoardsDataStore } from '../boards/boards-data-store';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import { HostedPluginEvents } from '../hosted/hosted-plugin-events';
+import { NotificationCenter } from '../notification-center';
+import { CurrentSketch } from '../sketches-service-client-impl';
+import { SketchContribution, URI } from './contribution';
+
+interface DaemonAddress {
+  /**
+   * The host where the Arduino CLI daemon is available.
+   */
+  readonly hostname: string;
+  /**
+   * The port where the Arduino CLI daemon is listening.
+   */
+  readonly port: number;
+  /**
+   * The [id](https://arduino.github.io/arduino-cli/latest/rpc/commands/#instance) of the initialized core Arduino client instance.
+   */
+  readonly instance: number;
+}
+
+interface StartLanguageServerParams {
+  /**
+   * Absolute filesystem path to the Arduino Language Server executable.
+   */
+  readonly lsPath: string;
+  /**
+   * The hostname and the port for the gRPC channel connecting to the Arduino CLI daemon.
+   * The `instance` number is for the initialized core Arduino client.
+   */
+  readonly daemonAddress: DaemonAddress;
+  /**
+   * Absolute filesystem path to [`clangd`](https://clangd.llvm.org/).
+   */
+  readonly clangdPath: string;
+  /**
+   * The board is relevant to start a specific "flavor" of the language.
+   */
+  readonly board: { fqbn: string; name?: string };
+  /**
+   * `true` if the LS should generate the log files into the default location. The default location is the `cwd` of the process.
+   * It's very often the same as the workspace root of the IDE, aka the sketch folder.
+   * When it is a string, it is the absolute filesystem path to the folder to generate the log files.
+   * If `string`, but the path is inaccessible, the log files will be generated into the default location.
+   */
+  readonly log?: boolean | string;
+  /**
+   * Optional `env` for the language server process.
+   */
+  readonly env?: NodeJS.ProcessEnv;
+  /**
+   * Additional flags for the Arduino Language server process.
+   */
+  readonly flags?: readonly string[];
+  /**
+   * Set to `true`, to enable `Diagnostics`.
+   */
+  readonly realTimeDiagnostics?: boolean;
+  /**
+   * If `true`, the logging is not forwarded to the _Output_ view via the language client.
+   */
+  readonly silentOutput?: boolean;
+  /**
+   * Number of async workers used by `clangd`. Background index also uses this many workers. If `0`, `clangd` uses all available cores. It's `0` by default.
+   */
+  readonly jobs?: number;
+}
+
+/**
+ * The FQBN the language server runs with or `undefined` if it could not start.
+ */
+type StartLanguageServerResult = string | undefined;
 
 @injectable()
 export class InoLanguage extends SketchContribution {
   @inject(HostedPluginEvents)
   private readonly hostedPluginEvents: HostedPluginEvents;
-
   @inject(ExecutableService)
   private readonly executableService: ExecutableService;
-
   @inject(ArduinoDaemon)
   private readonly daemon: ArduinoDaemon;
-
   @inject(BoardsService)
   private readonly boardsService: BoardsService;
-
   @inject(BoardsServiceProvider)
   private readonly boardsServiceProvider: BoardsServiceProvider;
-
   @inject(NotificationCenter)
   private readonly notificationCenter: NotificationCenter;
-
   @inject(BoardsDataStore)
   private readonly boardDataStore: BoardsDataStore;
 
@@ -45,7 +115,7 @@ export class InoLanguage extends SketchContribution {
 
   override onReady(): void {
     const start = (
-      { selectedBoard }: BoardsConfig.Config,
+      selectedBoard: BoardIdentifier | undefined,
       forceStart = false
     ) => {
       if (selectedBoard) {
@@ -56,12 +126,16 @@ export class InoLanguage extends SketchContribution {
       }
     };
     const forceRestart = () => {
-      start(this.boardsServiceProvider.boardsConfig, true);
+      start(this.boardsServiceProvider.boardsConfig.selectedBoard, true);
     };
     this.toDispose.pushAll([
-      this.boardsServiceProvider.onBoardsConfigChanged(start),
+      this.boardsServiceProvider.onBoardsConfigDidChange((event) => {
+        if (isBoardIdentifierChangeEvent(event)) {
+          start(event.selectedBoard);
+        }
+      }),
       this.hostedPluginEvents.onPluginsDidStart(() =>
-        start(this.boardsServiceProvider.boardsConfig)
+        start(this.boardsServiceProvider.boardsConfig.selectedBoard)
       ),
       this.hostedPluginEvents.onPluginsWillUnload(
         () => (this.languageServerFqbn = undefined)
@@ -72,6 +146,7 @@ export class InoLanguage extends SketchContribution {
             switch (preferenceName) {
               case 'arduino.language.log':
               case 'arduino.language.realTimeDiagnostics':
+              case 'arduino.language.asyncWorkers':
                 forceRestart();
             }
           }
@@ -82,7 +157,7 @@ export class InoLanguage extends SketchContribution {
       this.notificationCenter.onPlatformDidInstall(() => forceRestart()),
       this.notificationCenter.onPlatformDidUninstall(() => forceRestart()),
       this.notificationCenter.onDidReinitialize(() => forceRestart()),
-      this.boardDataStore.onChanged((dataChangePerFqbn) => {
+      this.boardDataStore.onDidChange((event) => {
         if (this.languageServerFqbn) {
           const sanitizedFqbn = sanitizeFqbn(this.languageServerFqbn);
           if (!sanitizeFqbn) {
@@ -90,20 +165,25 @@ export class InoLanguage extends SketchContribution {
               `Failed to sanitize the FQBN of the running language server. FQBN with the board settings was: ${this.languageServerFqbn}`
             );
           }
-          const matchingFqbn = dataChangePerFqbn.find(
-            (fqbn) => sanitizedFqbn === fqbn
+          const matchingChange = event.changes.find(
+            (change) => change.fqbn === sanitizedFqbn
           );
           const { boardsConfig } = this.boardsServiceProvider;
           if (
-            matchingFqbn &&
-            boardsConfig.selectedBoard?.fqbn === matchingFqbn
+            matchingChange &&
+            boardsConfig.selectedBoard?.fqbn === matchingChange.fqbn
           ) {
-            start(boardsConfig);
+            start(boardsConfig.selectedBoard);
           }
         }
       }),
     ]);
-    start(this.boardsServiceProvider.boardsConfig);
+    Promise.all([
+      this.boardsServiceProvider.ready,
+      this.preferences.ready,
+    ]).then(() => {
+      start(this.boardsServiceProvider.boardsConfig.selectedBoard);
+    });
   }
 
   onStop(): void {
@@ -119,7 +199,12 @@ export class InoLanguage extends SketchContribution {
     if (!port) {
       return;
     }
+    const portNumber = Number.parseInt(port, 10); // TODO: IDE2 APIs should provide a number and not string
+    if (Number.isNaN(portNumber)) {
+      return;
+    }
     const release = await this.languageServerStartMutex.acquire();
+    const toDisposeOnRelease = new DisposableCollection();
     try {
       await this.hostedPluginEvents.didStart;
       const details = await this.boardsService.getBoardDetails({ fqbn });
@@ -158,11 +243,16 @@ export class InoLanguage extends SketchContribution {
         // NOOP
         return;
       }
-      this.logger.info(`Starting language server: ${fqbnWithConfig}`);
       const log = this.preferences.get('arduino.language.log');
       const realTimeDiagnostics = this.preferences.get(
         'arduino.language.realTimeDiagnostics'
       );
+      const jobs = this.getAsyncWorkersPreferenceSafe();
+      this.logger.info(
+        `Starting language server: ${fqbnWithConfig}${
+          jobs ? ` (async worker count: ${jobs})` : ''
+        }`
+      );
       let currentSketchPath: string | undefined = undefined;
       if (log) {
         const currentSketch = await this.sketchServiceClient.currentSketch();
@@ -179,34 +269,61 @@ export class InoLanguage extends SketchContribution {
       ]);
 
       this.languageServerFqbn = await Promise.race([
-        new Promise<undefined>((_, reject) =>
-          setTimeout(
+        new Promise<undefined>((_, reject) => {
+          const timer = setTimeout(
             () => reject(new Error(`Timeout after ${20_000} ms.`)),
             20_000
-          )
-        ),
-        this.commandService.executeCommand<string>(
-          'arduino.languageserver.start',
-          {
+          );
+          toDisposeOnRelease.push(Disposable.create(() => clearTimeout(timer)));
+        }),
+        this.start({
           lsPath,
-            cliDaemonAddr: `localhost:${port}`,
+          daemonAddress: {
+            hostname: 'localhost',
+            port: portNumber,
+            instance: 1, // TODO: get it from the backend
+          },
           clangdPath,
           log: currentSketchPath ? currentSketchPath : log,
-            cliDaemonInstance: '1',
           board: {
             fqbn: fqbnWithConfig,
-              name: name ? `"${name}"` : undefined,
+            name,
           },
           realTimeDiagnostics,
           silentOutput: true,
-          }
-        ),
+          jobs,
+        }),
       ]);
     } catch (e) {
       console.log(`Failed to start language server. Original FQBN: ${fqbn}`, e);
       this.languageServerFqbn = undefined;
     } finally {
+      toDisposeOnRelease.dispose();
       release();
     }
   }
+  // The Theia preference UI validation is bogus.
+  // To restrict the number of jobs to a valid value.
+  private getAsyncWorkersPreferenceSafe(): number {
+    const jobs = this.preferences.get(
+      'arduino.language.asyncWorkers',
+      defaultAsyncWorkers
+    );
+    if (jobs < minAsyncWorkers) {
+      return minAsyncWorkers;
+    }
+    if (jobs > maxAsyncWorkers) {
+      return maxAsyncWorkers;
+    }
+    return jobs;
+  }
+
+  private async start(
+    params: StartLanguageServerParams
+  ): Promise<StartLanguageServerResult | undefined> {
+    return this.commandService.executeCommand<StartLanguageServerResult>(
+      'arduino.languageserver.start',
+      params
+    );
+  }
 }

arduino-ide-extension/src/browser/contributions/interface-scale.ts

@@ -8,7 +8,7 @@ import {
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { CommandRegistry, MaybePromise, nls } from '@theia/core/lib/common';
 import { Settings } from '../dialogs/settings/settings';
-import debounce = require('lodash.debounce');
+import debounce from 'lodash.debounce';
 
 @injectable()
 export class InterfaceScale extends Contribution {

arduino-ide-extension/src/browser/contributions/open-boards-config.ts

@@ -1,25 +1,18 @@
-import { CommandRegistry } from '@theia/core';
+import type { Command, CommandRegistry } from '@theia/core/lib/common/command';
 import { inject, injectable } from '@theia/core/shared/inversify';
+import type { EditBoardsConfigActionParams } from '../../common/protocol/board-list';
 import { BoardsConfigDialog } from '../boards/boards-config-dialog';
-import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import { Contribution, Command } from './contribution';
+import { Contribution } from './contribution';
 
 @injectable()
 export class OpenBoardsConfig extends Contribution {
-  @inject(BoardsServiceProvider)
-  private readonly boardsServiceProvider: BoardsServiceProvider;
-
   @inject(BoardsConfigDialog)
   private readonly boardsConfigDialog: BoardsConfigDialog;
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(OpenBoardsConfig.Commands.OPEN_DIALOG, {
-      execute: async (query?: string | undefined) => {
-        const boardsConfig = await this.boardsConfigDialog.open(query);
-        if (boardsConfig) {
-          return (this.boardsServiceProvider.boardsConfig = boardsConfig);
-        }
-      },
+      execute: async (params?: EditBoardsConfigActionParams) =>
+        this.boardsConfigDialog.open(params),
     });
   }
 }

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

@@ -1,5 +1,4 @@
 import { 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 { ArduinoMenus } from '../menu/arduino-menus';
 import {
@@ -9,7 +8,7 @@ import {
   MenuModelRegistry,
   KeybindingRegistry,
 } from './contribution';
-import { nls } from '@theia/core/lib/common';
+import { nls } from '@theia/core/lib/common/nls';
 
 @injectable()
 export class OpenSketchExternal extends SketchContribution {
@@ -41,7 +40,7 @@ export class OpenSketchExternal extends SketchContribution {
       if (exists) {
         const fsPath = await this.fileService.fsPath(new URI(uri));
         if (fsPath) {
-          remote.shell.showItemInFolder(fsPath);
+          window.electronTheiaCore.showItemInFolder(fsPath);
         }
       }
     }

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

@@ -45,7 +45,11 @@ export class OpenSketchFiles extends SketchContribution {
         await this.ensureOpened(uri);
       }
       if (focusMainSketchFile) {
-        await this.ensureOpened(mainFileUri, true, { mode: 'activate' });
+        await this.ensureOpened(mainFileUri, true, {
+          mode: 'activate',
+          preview: false,
+          counter: 0,
+        });
       }
       if (mainFileUri.endsWith('.pde')) {
         const message = nls.localize(
@@ -114,6 +118,7 @@ export class OpenSketchFiles extends SketchContribution {
       fileService: this.fileService,
       sketchesService: this.sketchesService,
       labelProvider: this.labelProvider,
+      dialogService: this.dialogService,
     });
     if (movedSketch) {
       this.workspaceService.open(new URI(movedSketch.uri), {

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

@@ -1,4 +1,3 @@
-import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { nls } from '@theia/core/lib/common/nls';
 import { injectable } from '@theia/core/shared/inversify';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
@@ -18,6 +17,7 @@ import {
   SketchContribution,
   URI,
 } from './contribution';
+import { DialogService } from '../dialog-service';
 
 export type SketchLocation = string | URI | SketchRef;
 export namespace SketchLocation {
@@ -83,9 +83,7 @@ export class OpenSketch extends SketchContribution {
 
   private async selectSketch(): Promise<Sketch | undefined> {
     const defaultPath = await this.defaultPath();
-    const { filePaths } = await remote.dialog.showOpenDialog(
-      remote.getCurrentWindow(),
-      {
+    const { filePaths } = await this.dialogService.showOpenDialog({
       defaultPath,
       properties: ['createDirectory', 'openFile'],
       filters: [
@@ -94,8 +92,7 @@ export class OpenSketch extends SketchContribution {
           extensions: ['ino', 'pde'],
         },
       ],
-      }
-    );
+    });
     if (!filePaths.length) {
       return undefined;
     }
@@ -115,6 +112,7 @@ export class OpenSketch extends SketchContribution {
         fileService: this.fileService,
         sketchesService: this.sketchesService,
         labelProvider: this.labelProvider,
+        dialogService: this.dialogService,
       });
     }
   }
@@ -134,14 +132,16 @@ export async function promptMoveSketch(
     fileService: FileService;
     sketchesService: SketchesService;
     labelProvider: LabelProvider;
+    dialogService: DialogService;
   }
 ): Promise<Sketch | undefined> {
-  const { fileService, sketchesService, labelProvider } = options;
+  const { fileService, sketchesService, labelProvider, dialogService } =
+    options;
   const uri =
     sketchFileUri instanceof URI ? sketchFileUri : new URI(sketchFileUri);
   const name = uri.path.name;
   const nameWithExt = labelProvider.getName(uri);
-  const { response } = await remote.dialog.showMessageBox({
+  const { response } = await dialogService.showMessageBox({
     title: nls.localize('arduino/sketch/moving', 'Moving'),
     type: 'question',
     buttons: [
@@ -160,7 +160,7 @@ export async function promptMoveSketch(
     const newSketchUri = uri.parent.resolve(name);
     const exists = await fileService.exists(newSketchUri);
     if (exists) {
-      await remote.dialog.showMessageBox({
+      await dialogService.showMessageBox({
         type: 'error',
         title: nls.localize('vscode/dialog/dialogErrorMessage', 'Error'),
         message: nls.localize(

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

@@ -1,5 +1,4 @@
-import { injectable } from '@theia/core/shared/inversify';
-import * as remote from '@theia/core/electron-shared/@electron/remote';
+import { inject, injectable } from '@theia/core/shared/inversify';
 import { isOSX } from '@theia/core/lib/common/os';
 import {
   Contribution,
@@ -9,14 +8,18 @@ import {
   CommandRegistry,
 } from './contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import { nls } from '@theia/core/lib/common';
+import { nls } from '@theia/core/lib/common/nls';
+import { AppService } from '../app-service';
 
 @injectable()
 export class QuitApp extends Contribution {
+  @inject(AppService)
+  private readonly appService: AppService;
+
   override registerCommands(registry: CommandRegistry): void {
     if (!isOSX) {
       registry.registerCommand(QuitApp.Commands.QUIT_APP, {
-        execute: () => remote.app.quit(),
+        execute: () => this.appService.quit(),
       });
     }
   }

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

@@ -1,14 +1,15 @@
-import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { Dialog } from '@theia/core/lib/browser/dialogs';
 import { NavigatableWidget } from '@theia/core/lib/browser/navigatable';
 import { Saveable } from '@theia/core/lib/browser/saveable';
 import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
 import { WindowService } from '@theia/core/lib/browser/window/window-service';
+import { ApplicationError } from '@theia/core/lib/common/application-error';
 import { nls } from '@theia/core/lib/common/nls';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
 import { WorkspaceInput } from '@theia/workspace/lib/browser/workspace-service';
-import { StartupTask } from '../../electron-common/startup-task';
+import { SketchesError } from '../../common/protocol';
+import { StartupTasks } from '../../electron-common/startup-task';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { CurrentSketch } from '../sketches-service-client-impl';
 import { CloudSketchContribution } from './cloud-contribution';
@@ -25,6 +26,7 @@ import {
   RenameCloudSketch,
   RenameCloudSketchParams,
 } from './rename-cloud-sketch';
+import { assertConnectedToBackend } from './save-sketch';
 
 @injectable()
 export class SaveAsSketch extends CloudSketchContribution {
@@ -35,7 +37,29 @@ export class SaveAsSketch extends CloudSketchContribution {
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(SaveAsSketch.Commands.SAVE_AS_SKETCH, {
-      execute: (args) => this.saveAs(args),
+      execute: async (args) => {
+        try {
+          return await this.saveAs(args);
+        } catch (err) {
+          let message = String(err);
+          if (ApplicationError.is(err)) {
+            if (SketchesError.SketchAlreadyContainsThisFile.is(err)) {
+              message = nls.localize(
+                'arduino/sketch/sketchAlreadyContainsThisFileMessage',
+                'Failed to save sketch "{0}" as "{1}". {2}',
+                err.data.sourceSketchName,
+                err.data.targetSketchName,
+                err.message
+              );
+            } else {
+              message = err.message;
+            }
+          } else if (err instanceof Error) {
+            message = err.message;
+          }
+          this.messageService.error(message);
+        }
+      },
     });
   }
 
@@ -58,13 +82,18 @@ export class SaveAsSketch extends CloudSketchContribution {
    * Resolves `true` if the sketch was successfully saved as something.
    */
   private async saveAs(
-    {
+    params = SaveAsSketch.Options.DEFAULT
+  ): Promise<boolean> {
+    const {
       execOnlyIfTemp,
       openAfterMove,
       wipeOriginal,
       markAsRecentlyOpened,
-    }: SaveAsSketch.Options = SaveAsSketch.Options.DEFAULT
-  ): Promise<boolean> {
+    } = params;
+    assertConnectedToBackend({
+      connectionStatusService: this.connectionStatusService,
+      messageService: this.messageService,
+    });
     const sketch = await this.sketchServiceClient.currentSketch();
     if (!CurrentSketch.isValid(sketch)) {
       return false;
@@ -95,7 +124,7 @@ export class SaveAsSketch extends CloudSketchContribution {
     if (markAsRecentlyOpened) {
       this.sketchesService.markAsRecentlyOpened(newWorkspaceUri);
     }
-    const options: WorkspaceInput & StartupTask.Owner = {
+    const options: WorkspaceInput & StartupTasks = {
       preserveWindow: true,
       tasks: [],
     };
@@ -165,16 +194,13 @@ export class SaveAsSketch extends CloudSketchContribution {
   ): Promise<string | undefined> {
     let sketchFolderDestinationUri: string | undefined;
     while (!sketchFolderDestinationUri) {
-      const { filePath } = await remote.dialog.showSaveDialog(
-        remote.getCurrentWindow(),
-        {
+      const { filePath } = await this.dialogService.showSaveDialog({
         title: nls.localize(
           'arduino/sketch/saveFolderAs',
           'Save sketch folder as...'
         ),
         defaultPath,
-        }
-      );
+      });
       if (!filePath) {
         return undefined;
       }
@@ -225,13 +251,10 @@ ${dialogContent.details}
 
 ${dialogContent.question}`.trim();
         defaultPath = filePath;
-        const { response } = await remote.dialog.showMessageBox(
-          remote.getCurrentWindow(),
-          {
+        const { response } = await this.dialogService.showMessageBox({
           message,
           buttons: [Dialog.CANCEL, Dialog.YES],
-          }
-        );
+        });
         // cancel
         if (response === 0) {
           return undefined;

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

@@ -1,16 +1,18 @@
-import { injectable } from '@theia/core/shared/inversify';
 import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribution';
+import { MessageService } from '@theia/core/lib/common/message-service';
+import { nls } from '@theia/core/lib/common/nls';
+import { injectable } from '@theia/core/shared/inversify';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import { SaveAsSketch } from './save-as-sketch';
+import { CurrentSketch } from '../sketches-service-client-impl';
+import { ApplicationConnectionStatusContribution } from '../theia/core/connection-status-service';
 import {
-  SketchContribution,
   Command,
   CommandRegistry,
-  MenuModelRegistry,
   KeybindingRegistry,
+  MenuModelRegistry,
+  SketchContribution,
 } from './contribution';
-import { nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../sketches-service-client-impl';
+import { SaveAsSketch } from './save-as-sketch';
 
 @injectable()
 export class SaveSketch extends SketchContribution {
@@ -36,6 +38,10 @@ export class SaveSketch extends SketchContribution {
   }
 
   async saveSketch(): Promise<void> {
+    assertConnectedToBackend({
+      connectionStatusService: this.connectionStatusService,
+      messageService: this.messageService,
+    });
     const sketch = await this.sketchServiceClient.currentSketch();
     if (!CurrentSketch.isValid(sketch)) {
       return;
@@ -63,3 +69,18 @@ export namespace SaveSketch {
     };
   }
 }
+
+// https://github.com/arduino/arduino-ide/issues/2081
+export function assertConnectedToBackend(param: {
+  connectionStatusService: ApplicationConnectionStatusContribution;
+  messageService: MessageService;
+}): void {
+  if (param.connectionStatusService.offlineStatus === 'backend') {
+    const message = nls.localize(
+      'theia/core/couldNotSave',
+      'Could not save the sketch. Please copy your unsaved work into your favorite text editor, and restart the IDE.'
+    );
+    param.messageService.error(message);
+    throw new Error(message);
+  }
+}

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

@@ -4,7 +4,10 @@ import {
 } from '@theia/core/lib/browser/status-bar/status-bar';
 import { nls } from '@theia/core/lib/common/nls';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { BoardsConfig } from '../boards/boards-config';
+import type {
+  BoardList,
+  BoardListItem,
+} from '../../common/protocol/board-list';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
 import { Contribution } from './contribution';
 
@@ -12,21 +15,23 @@ import { Contribution } from './contribution';
 export class SelectedBoard extends Contribution {
   @inject(StatusBar)
   private readonly statusBar: StatusBar;
-
   @inject(BoardsServiceProvider)
   private readonly boardsServiceProvider: BoardsServiceProvider;
 
   override onStart(): void {
-    this.boardsServiceProvider.onBoardsConfigChanged((config) =>
-      this.update(config)
+    this.boardsServiceProvider.onBoardListDidChange((boardList) =>
+      this.update(boardList)
     );
   }
 
   override onReady(): void {
-    this.update(this.boardsServiceProvider.boardsConfig);
+    this.boardsServiceProvider.ready.then(() => this.update());
   }
 
-  private update({ selectedBoard, selectedPort }: BoardsConfig.Config): void {
+  private update(
+    boardList: BoardList = this.boardsServiceProvider.boardList
+  ): void {
+    const { selectedBoard, selectedPort } = boardList.boardsConfig;
     this.statusBar.setElement('arduino-selected-board', {
       alignment: StatusBarAlignment.RIGHT,
       text: selectedBoard
@@ -38,17 +43,30 @@ export class SelectedBoard extends Contribution {
       className: 'arduino-selected-board',
     });
     if (selectedBoard) {
-      this.statusBar.setElement('arduino-selected-port', {
-        alignment: StatusBarAlignment.RIGHT,
-        text: selectedPort
-          ? nls.localize(
+      const notConnectedLabel = nls.localize(
+        'arduino/common/notConnected',
+        '[not connected]'
+      );
+      let portLabel = notConnectedLabel;
+      if (selectedPort) {
+        portLabel = nls.localize(
           'arduino/common/selectedOn',
           'on {0}',
           selectedPort.address
-            )
-          : nls.localize('arduino/common/notConnected', '[not connected]'),
+        );
+        const selectedItem: BoardListItem | undefined =
+          boardList.items[boardList.selectedIndex];
+        if (!selectedItem) {
+          portLabel += ` ${notConnectedLabel}`; // append ` [not connected]` when the port is selected but it's not detected by the CLI
+        }
+      }
+      this.statusBar.setElement('arduino-selected-port', {
+        alignment: StatusBarAlignment.RIGHT,
+        text: portLabel,
         className: 'arduino-selected-port',
       });
+    } else {
+      this.statusBar.removeElement('arduino-selected-port');
     }
   }
 }

arduino-ide-extension/src/browser/contributions/startup-task.ts

@@ -1,52 +0,0 @@
-import * as remote from '@theia/core/electron-shared/@electron/remote';
-import type { IpcRendererEvent } from '@theia/core/electron-shared/electron';
-import { ipcRenderer } from '@theia/core/electron-shared/electron';
-import { injectable } from '@theia/core/shared/inversify';
-import { StartupTask } from '../../electron-common/startup-task';
-import { Contribution } from './contribution';
-
-@injectable()
-export class StartupTasks extends Contribution {
-  override onReady(): void {
-    ipcRenderer.once(
-      StartupTask.Messaging.STARTUP_TASKS_SIGNAL,
-      (_: IpcRendererEvent, args: unknown) => {
-        console.debug(
-          `Received the startup tasks from the electron main process. Args: ${JSON.stringify(
-            args
-          )}`
-        );
-        if (!StartupTask.has(args)) {
-          console.warn(`Could not detect 'tasks' from the signal. Skipping.`);
-          return;
-        }
-        const tasks = args.tasks;
-        if (tasks.length) {
-          console.log(`Executing startup tasks:`);
-          tasks.forEach(({ command, args = [] }) => {
-            console.log(
-              ` - '${command}' ${
-                args.length ? `, args: ${JSON.stringify(args)}` : ''
-              }`
-            );
-            this.commandService
-              .executeCommand(command, ...args)
-              .catch((err) =>
-                console.error(
-                  `Error occurred when executing the startup task '${command}'${
-                    args?.length ? ` with args: '${JSON.stringify(args)}` : ''
-                  }.`,
-                  err
-                )
-              );
-          });
-        }
-      }
-    );
-    const { id } = remote.getCurrentWindow();
-    console.debug(
-      `Signalling app ready event to the electron main process. Sender ID: ${id}.`
-    );
-    ipcRenderer.send(StartupTask.Messaging.APP_READY_SIGNAL(id));
-  }
-}

arduino-ide-extension/src/browser/contributions/startup-tasks-executor.ts

@@ -0,0 +1,65 @@
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import {
+  inject,
+  injectable,
+  postConstruct,
+} from '@theia/core/shared/inversify';
+import {
+  hasStartupTasks,
+  StartupTasks,
+} from '../../electron-common/startup-task';
+import { AppService } from '../app-service';
+import { Contribution } from './contribution';
+
+@injectable()
+export class StartupTasksExecutor extends Contribution {
+  @inject(AppService)
+  private readonly appService: AppService;
+
+  private readonly toDispose = new DisposableCollection();
+
+  @postConstruct()
+  protected override init(): void {
+    super.init();
+    this.toDispose.push(
+      this.appService.registerStartupTasksHandler((tasks) =>
+        this.handleStartupTasks(tasks)
+      )
+    );
+  }
+
+  onStop(): void {
+    this.toDispose.dispose();
+  }
+
+  private async handleStartupTasks(tasks: StartupTasks): Promise<void> {
+    console.debug(
+      `Received the startup tasks from the electron main process. Args: ${JSON.stringify(
+        tasks
+      )}`
+    );
+    if (!hasStartupTasks(tasks)) {
+      console.warn(`Could not detect 'tasks' from the signal. Skipping.`);
+      return;
+    }
+    await this.appStateService.reachedState('ready');
+    console.log(`Executing startup tasks:`);
+    tasks.tasks.forEach(({ command, args = [] }) => {
+      console.log(
+        ` - '${command}' ${
+          args.length ? `, args: ${JSON.stringify(args)}` : ''
+        }`
+      );
+      this.commandService
+        .executeCommand(command, ...args)
+        .catch((err) =>
+          console.error(
+            `Error occurred when executing the startup task '${command}'${
+              args?.length ? ` with args: '${JSON.stringify(args)}` : ''
+            }.`,
+            err
+          )
+        );
+    });
+  }
+}

arduino-ide-extension/src/browser/contributions/update-arduino-state.ts

@@ -0,0 +1,184 @@
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import URI from '@theia/core/lib/common/uri';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { HostedPluginSupport } from '../hosted/hosted-plugin-support';
+import type { ArduinoState } from 'vscode-arduino-api';
+import {
+  BoardsService,
+  CompileSummary,
+  isCompileSummary,
+  BoardsConfig,
+  PortIdentifier,
+  resolveDetectedPort,
+} from '../../common/protocol';
+import {
+  toApiBoardDetails,
+  toApiCompileSummary,
+  toApiPort,
+} from '../../common/protocol/arduino-context-mapper';
+import { BoardsDataStore } from '../boards/boards-data-store';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import { CurrentSketch } from '../sketches-service-client-impl';
+import { SketchContribution } from './contribution';
+
+/**
+ * (non-API) exported for tests
+ */
+export interface UpdateStateParams<T extends ArduinoState = ArduinoState> {
+  readonly key: keyof T;
+  readonly value: T[keyof T];
+}
+
+/**
+ * Contribution for updating the Arduino state, such as the FQBN, selected port, and sketch path changes via commands, so other VS Code extensions can access it.
+ * See [`vscode-arduino-api`](https://github.com/dankeboy36/vscode-arduino-api#api) for more details.
+ */
+@injectable()
+export class UpdateArduinoState extends SketchContribution {
+  @inject(BoardsService)
+  private readonly boardsService: BoardsService;
+  @inject(BoardsServiceProvider)
+  private readonly boardsServiceProvider: BoardsServiceProvider;
+  @inject(BoardsDataStore)
+  private readonly boardsDataStore: BoardsDataStore;
+  @inject(HostedPluginSupport)
+  private readonly hostedPluginSupport: HostedPluginSupport;
+
+  private readonly toDispose = new DisposableCollection();
+
+  override onStart(): void {
+    this.toDispose.pushAll([
+      this.boardsServiceProvider.onBoardsConfigDidChange(() =>
+        this.updateBoardsConfig(this.boardsServiceProvider.boardsConfig)
+      ),
+      this.sketchServiceClient.onCurrentSketchDidChange((sketch) =>
+        this.updateSketchPath(sketch)
+      ),
+      this.configService.onDidChangeDataDirUri((dataDirUri) =>
+        this.updateDataDirPath(dataDirUri)
+      ),
+      this.configService.onDidChangeSketchDirUri((userDirUri) =>
+        this.updateUserDirPath(userDirUri)
+      ),
+      this.commandService.onDidExecuteCommand(({ commandId, args }) => {
+        if (
+          commandId === 'arduino.languageserver.notifyBuildDidComplete' &&
+          isCompileSummary(args[0])
+        ) {
+          this.updateCompileSummary(args[0]);
+        }
+      }),
+      this.boardsDataStore.onDidChange((event) => {
+        const selectedFqbn =
+          this.boardsServiceProvider.boardsConfig.selectedBoard?.fqbn;
+        if (
+          selectedFqbn &&
+          event.changes.find((change) => change.fqbn === selectedFqbn)
+        ) {
+          this.updateBoardDetails(selectedFqbn);
+        }
+      }),
+    ]);
+  }
+
+  override onReady(): void {
+    this.boardsServiceProvider.ready.then(() => {
+      this.updateBoardsConfig(this.boardsServiceProvider.boardsConfig);
+    });
+    this.updateSketchPath(this.sketchServiceClient.tryGetCurrentSketch());
+    this.updateUserDirPath(this.configService.tryGetSketchDirUri());
+    this.updateDataDirPath(this.configService.tryGetDataDirUri());
+  }
+
+  onStop(): void {
+    this.toDispose.dispose();
+  }
+
+  private async updateSketchPath(
+    sketch: CurrentSketch | undefined
+  ): Promise<void> {
+    const sketchPath = CurrentSketch.isValid(sketch)
+      ? new URI(sketch.uri).path.fsPath()
+      : undefined;
+    return this.updateState({ key: 'sketchPath', value: sketchPath });
+  }
+
+  private async updateCompileSummary(
+    compileSummary: CompileSummary
+  ): Promise<void> {
+    const apiCompileSummary = toApiCompileSummary(compileSummary);
+    return this.updateState({
+      key: 'compileSummary',
+      value: apiCompileSummary,
+    });
+  }
+
+  private async updateBoardsConfig(boardsConfig: BoardsConfig): Promise<void> {
+    const fqbn = boardsConfig.selectedBoard?.fqbn;
+    const port = boardsConfig.selectedPort;
+    await this.updateFqbn(fqbn);
+    await this.updateBoardDetails(fqbn);
+    await this.updatePort(port);
+  }
+
+  private async updateFqbn(fqbn: string | undefined): Promise<void> {
+    await this.updateState({ key: 'fqbn', value: fqbn });
+  }
+
+  private async updateBoardDetails(fqbn: string | undefined): Promise<void> {
+    const unset = () =>
+      this.updateState({ key: 'boardDetails', value: undefined });
+    if (!fqbn) {
+      return unset();
+    }
+    const [details, persistedData] = await Promise.all([
+      this.boardsService.getBoardDetails({ fqbn }),
+      this.boardsDataStore.getData(fqbn),
+    ]);
+    if (!details) {
+      return unset();
+    }
+    const apiBoardDetails = toApiBoardDetails({
+      ...details,
+      configOptions:
+        BoardsDataStore.Data.EMPTY === persistedData
+          ? details.configOptions
+          : persistedData.configOptions.slice(),
+    });
+    return this.updateState({
+      key: 'boardDetails',
+      value: apiBoardDetails,
+    });
+  }
+
+  private async updatePort(port: PortIdentifier | undefined): Promise<void> {
+    const resolvedPort =
+      port &&
+      resolveDetectedPort(port, this.boardsServiceProvider.detectedPorts);
+    const apiPort = resolvedPort && toApiPort(resolvedPort);
+    return this.updateState({ key: 'port', value: apiPort });
+  }
+
+  private async updateUserDirPath(userDirUri: URI | undefined): Promise<void> {
+    const userDirPath = userDirUri?.path.fsPath();
+    return this.updateState({
+      key: 'userDirPath',
+      value: userDirPath,
+    });
+  }
+
+  private async updateDataDirPath(dataDirUri: URI | undefined): Promise<void> {
+    const dataDirPath = dataDirUri?.path.fsPath();
+    return this.updateState({
+      key: 'dataDirPath',
+      value: dataDirPath,
+    });
+  }
+
+  private async updateState<T extends ArduinoState>(
+    params: UpdateStateParams<T>
+  ): Promise<void> {
+    await this.hostedPluginSupport.didStart;
+    return this.commandService.executeCommand('arduinoAPI.updateState', params);
+  }
+}

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

@@ -16,7 +16,10 @@ import {
   arduinoCert,
   certificateList,
 } from '../dialogs/certificate-uploader/utils';
-import { ArduinoFirmwareUploader } from '../../common/protocol/arduino-firmware-uploader';
+import {
+  ArduinoFirmwareUploader,
+  UploadCertificateParams,
+} from '../../common/protocol/arduino-firmware-uploader';
 import { nls } from '@theia/core/lib/common';
 
 @injectable()
@@ -74,12 +77,8 @@ export class UploadCertificate extends Contribution {
     });
 
     registry.registerCommand(UploadCertificate.Commands.UPLOAD_CERT, {
-      execute: async ({ fqbn, address, urls }) => {
-        return this.arduinoFirmwareUploader.uploadCertificates(
-          `-b ${fqbn} -a ${address} ${urls
-            .map((url: string) => `-u ${url}`)
-            .join(' ')}`
-        );
+      execute: async (params: UploadCertificateParams) => {
+        return this.arduinoFirmwareUploader.uploadCertificates(params);
       },
     });
 

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

@@ -45,10 +45,7 @@ export namespace UploadFirmware {
   export namespace Commands {
     export const OPEN: Command = {
       id: 'arduino-upload-firmware-open',
-      label: nls.localize(
-        'arduino/firmware/updater',
-        'WiFi101 / WiFiNINA Firmware Updater'
-      ),
+      label: nls.localize('arduino/firmware/updater', 'Firmware Updater'),
       category: 'Arduino',
     };
   }

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

@@ -1,30 +1,30 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
 import { Emitter } from '@theia/core/lib/common/event';
-import { CoreService, Port, sanitizeFqbn } from '../../common/protocol';
+import { nls } from '@theia/core/lib/common/nls';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { CoreService, sanitizeFqbn } from '../../common/protocol';
 import { ArduinoMenus } from '../menu/arduino-menus';
+import { CurrentSketch } from '../sketches-service-client-impl';
 import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import {
   Command,
   CommandRegistry,
-  MenuModelRegistry,
-  KeybindingRegistry,
-  TabBarToolbarRegistry,
   CoreServiceContribution,
+  KeybindingRegistry,
+  MenuModelRegistry,
+  TabBarToolbarRegistry,
 } from './contribution';
-import { deepClone, nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../sketches-service-client-impl';
-import type { VerifySketchParams } from './verify-sketch';
 import { UserFields } from './user-fields';
+import type { VerifySketchParams } from './verify-sketch';
 
 @injectable()
 export class UploadSketch extends CoreServiceContribution {
+  @inject(UserFields)
+  private readonly userFields: UserFields;
+
   private readonly onDidChangeEmitter = new Emitter<void>();
   private readonly onDidChange = this.onDidChangeEmitter.event;
   private uploadInProgress = false;
 
-  @inject(UserFields)
-  private readonly userFields: UserFields;
-
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(UploadSketch.Commands.UPLOAD_SKETCH, {
       execute: async () => {
@@ -107,7 +107,6 @@ export class UploadSketch extends CoreServiceContribution {
       // uploadInProgress will be set to false whether the upload fails or not
       this.uploadInProgress = true;
       this.menuManager.update();
-      this.boardsServiceProvider.snapshotBoardDiscoveryOnUpload();
       this.onDidChangeEmitter.fire();
       this.clearVisibleNotification();
 
@@ -135,12 +134,14 @@ export class UploadSketch extends CoreServiceContribution {
         return;
       }
 
-      await this.doWithProgress({
+      const uploadResponse = await this.doWithProgress({
         progressText: nls.localize('arduino/sketch/uploading', 'Uploading...'),
         task: (progressId, coreService) =>
           coreService.upload({ ...uploadOptions, progressId }),
         keepOutput: true,
       });
+      // the port update is NOOP if nothing has changed
+      this.boardsServiceProvider.updateConfig(uploadResponse.portAfterUpload);
 
       this.messageService.info(
         nls.localize('arduino/sketch/doneUploading', 'Done uploading.'),
@@ -150,9 +151,10 @@ export class UploadSketch extends CoreServiceContribution {
       this.userFields.notifyFailedWithError(e);
       this.handleError(e);
     } finally {
+      // TODO: here comes the port change if happened during the upload
+      // https://github.com/arduino/arduino-cli/issues/2245
       this.uploadInProgress = false;
       this.menuManager.update();
-      this.boardsServiceProvider.attemptPostUploadAutoSelect();
       this.onDidChangeEmitter.fire();
     }
   }
@@ -174,7 +176,7 @@ export class UploadSketch extends CoreServiceContribution {
         this.preferences.get('arduino.upload.verify'),
         this.preferences.get('arduino.upload.verbose'),
       ]);
-    const port = this.maybeUpdatePortProperties(boardsConfig.selectedPort);
+    const port = boardsConfig.selectedPort;
     return {
       sketch,
       fqbn,
@@ -185,28 +187,6 @@ export class UploadSketch extends CoreServiceContribution {
       userFields,
     };
   }
-
-  /**
-   * This is a hack to ensure that the port object has the `properties` when uploading.(https://github.com/arduino/arduino-ide/issues/740)
-   * This method works around a bug when restoring a `port` persisted by an older version of IDE2. See the bug [here](https://github.com/arduino/arduino-ide/pull/1335#issuecomment-1224355236).
-   *
-   * Before the upload, this method checks the available ports and makes sure that the `properties` of an available port, and the port selected by the user have the same `properties`.
-   * This method does not update any state (for example, the `BoardsConfig.Config`) but uses the correct `properties` for the `upload`.
-   */
-  private maybeUpdatePortProperties(port: Port | undefined): Port | undefined {
-    if (port) {
-      const key = Port.keyOf(port);
-      for (const candidate of this.boardsServiceProvider.availablePorts) {
-        if (key === Port.keyOf(candidate) && candidate.properties) {
-          return {
-            ...port,
-            properties: deepClone(candidate.properties),
-          };
-        }
-      }
-    }
-    return port;
-  }
 }
 
 export namespace UploadSketch {

arduino-ide-extension/src/browser/contributions/user-fields.ts

@@ -1,10 +1,10 @@
+import { nls } from '@theia/core/lib/common/nls';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { nls } from '@theia/core/lib/common';
 import { BoardUserField, CoreError } from '../../common/protocol';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
 import { UserFieldsDialog } from '../dialogs/user-fields/user-fields-dialog';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import { MenuModelRegistry, Contribution } from './contribution';
+import { Contribution, MenuModelRegistry } from './contribution';
 import { UploadSketch } from './upload-sketch';
 
 @injectable()
@@ -21,12 +21,11 @@ export class UserFields extends Contribution {
 
   protected override init(): void {
     super.init();
-    this.boardsServiceProvider.onBoardsConfigChanged(async () => {
-      const userFields =
-        await this.boardsServiceProvider.selectedBoardUserFields();
-      this.boardRequiresUserFields = userFields.length > 0;
-      this.menuManager.update();
-    });
+    this.boardsServiceProvider.onBoardsConfigDidChange(() => this.refresh());
+  }
+
+  override onReady(): void {
+    this.boardsServiceProvider.ready.then(() => this.refresh());
   }
 
   override registerMenus(registry: MenuModelRegistry): void {
@@ -37,16 +36,20 @@ export class UserFields extends Contribution {
     });
   }
 
+  private async refresh(): Promise<void> {
+    const userFields =
+      await this.boardsServiceProvider.selectedBoardUserFields();
+    this.boardRequiresUserFields = userFields.length > 0;
+    this.menuManager.update();
+  }
+
   private selectedFqbnAddress(): string | undefined {
     const { boardsConfig } = this.boardsServiceProvider;
     const fqbn = boardsConfig.selectedBoard?.fqbn;
     if (!fqbn) {
       return undefined;
     }
-    const address =
-      boardsConfig.selectedBoard?.port?.address ||
-      boardsConfig.selectedPort?.address ||
-      '';
+    const address = boardsConfig.selectedPort?.address || '';
     return fqbn + '|' + address;
   }
 

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

@@ -1,4 +1,3 @@
-import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { Dialog } from '@theia/core/lib/browser/dialogs';
 import { nls } from '@theia/core/lib/common/nls';
 import { Deferred, waitForEvent } from '@theia/core/lib/common/promise-util';
@@ -180,15 +179,12 @@ export class ValidateSketch extends CloudSketchContribution {
     message: string,
     buttons: string[] = [Dialog.CANCEL, Dialog.OK]
   ): Promise<boolean> {
-    const { response } = await remote.dialog.showMessageBox(
-      remote.getCurrentWindow(),
-      {
+    const { response } = await this.dialogService.showMessageBox({
       title,
       message,
       type: 'warning',
       buttons,
-      }
-    );
+    });
     // cancel
     if (response === 0) {
       return false;

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

@@ -57,36 +57,63 @@ export class CreateApi {
     return result;
   }
 
+  /**
+   * `sketchPath` is not the POSIX path but the path with the user UUID, username, etc.
+   * See [Create.Resource#path](./typings.ts). If `cache` is `true` and a sketch exists with the path,
+   * the cache will be updated with the new state of the sketch.
+   */
+  // TODO: no nulls in API
+  async sketchByPath(
+    sketchPath: string,
+    cache = false
+  ): Promise<Create.Sketch | null> {
+    const url = new URL(`${this.domain()}/sketches/byPath/${sketchPath}`);
+    const headers = await this.headers();
+    const sketch = await this.run<Create.Sketch>(url, {
+      method: 'GET',
+      headers,
+    });
+    if (sketch && cache) {
+      this.sketchCache.addSketch(sketch);
+      const posixPath = createPaths.toPosixPath(sketch.path);
+      this.sketchCache.purgeByPath(posixPath);
+    }
+    return sketch;
+  }
+
   async sketches(limit = 50): Promise<Create.Sketch[]> {
     const url = new URL(`${this.domain()}/sketches`);
     url.searchParams.set('user_id', 'me');
     url.searchParams.set('limit', limit.toString());
     const headers = await this.headers();
-    const result: { sketches: Create.Sketch[] } = { sketches: [] };
-
-    let partialSketches: Create.Sketch[] = [];
+    const allSketches: Create.Sketch[] = [];
     let currentOffset = 0;
-    do {
+    while (true) {
       url.searchParams.set('offset', currentOffset.toString());
-      partialSketches = (
-        await this.run<{ sketches: Create.Sketch[] }>(url, {
+      const { sketches } = await this.run<{ sketches: Create.Sketch[] }>(url, {
         method: 'GET',
         headers,
-        })
-      ).sketches;
-      if (partialSketches.length !== 0) {
-        result.sketches = result.sketches.concat(partialSketches);
+      });
+      allSketches.push(...sketches);
+      if (sketches.length < limit) {
+        break;
       }
-      currentOffset = currentOffset + limit;
-    } while (partialSketches.length !== 0);
-
-    result.sketches.forEach((sketch) => this.sketchCache.addSketch(sketch));
-    return result.sketches;
+      currentOffset += limit;
+      // The create API doc show that there is `next` and `prev` pages, but it does not work
+      // https://api2.arduino.cc/create/docs#!/sketches95v2/sketches_v2_search
+      // IF sketchCount mod limit === 0, an extra fetch must happen to detect the end of the pagination.
+    }
+    allSketches.forEach((sketch) => this.sketchCache.addSketch(sketch));
+    return allSketches;
   }
 
   async createSketch(
     posixPath: string,
-    contentProvider: MaybePromise<string> = this.sketchesService.defaultInoContent()
+    contentProvider: MaybePromise<string> = this.sketchesService.defaultInoContent(),
+    payloadOverride: Record<
+      string,
+      string | boolean | number | Record<string, unknown>
+    > = {}
   ): Promise<Create.Sketch> {
     const url = new URL(`${this.domain()}/sketches`);
     const [headers, content] = await Promise.all([
@@ -97,6 +124,7 @@ export class CreateApi {
       ino: btoa(content),
       path: posixPath,
       user_id: 'me',
+      ...payloadOverride,
     };
     const init = {
       method: 'PUT',
@@ -151,7 +179,8 @@ export class CreateApi {
         );
       })
       .catch((reason) => {
-        if (reason?.status === 404) return [] as Create.Resource[];
+        if (reason?.status === 404)
+          return [] as Create.Resource[]; // TODO: must not swallow 404
         else throw reason;
       });
   }
@@ -212,7 +241,17 @@ export class CreateApi {
         return data;
       }
 
-      const sketch = this.sketchCache.getSketch(createPaths.parentPosix(path));
+      const posixPath = createPaths.parentPosix(path);
+      let sketch = this.sketchCache.getSketch(posixPath);
+      // Workaround for https://github.com/arduino/arduino-ide/issues/1999.
+      if (!sketch) {
+        // Convert the ordinary sketch POSIX path to the Create path.
+        // For example, `/sketch_apr6a` will be transformed to `8a694e4b83878cc53472bd75ee928053:kittaakos/sketches_v2/sketch_apr6a`.
+        const createPathPrefix = this.sketchCache.createPathPrefix;
+        if (createPathPrefix) {
+          sketch = await this.sketchByPath(createPathPrefix + posixPath, true);
+        }
+      }
 
       if (
         sketch &&
@@ -453,7 +492,6 @@ export class CreateApi {
     init: RequestInit | undefined,
     resultProvider: ResponseResultProvider = ResponseResultProvider.JSON
   ): Promise<T> {
-    console.debug(`HTTP ${init?.method}: ${requestInfo.toString()}`);
     const response = await fetch(requestInfo.toString(), init);
     if (!response.ok) {
       let details: string | undefined = undefined;

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

@@ -4,10 +4,14 @@ import { Emitter, Event } from '@theia/core/lib/common/event';
 import URI from '@theia/core/lib/common/uri';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { Sketch } from '../../common/protocol';
-import { AuthenticationSession } from '../../node/auth/types';
+import { AuthenticationSession } from '../../common/protocol/authentication-service';
 import { ArduinoPreferences } from '../arduino-preferences';
 import { AuthenticationClientService } from '../auth/authentication-client-service';
 import { LocalCacheFsProvider } from '../local-cache/local-cache-fs-provider';
+import {
+  ARDUINO_CLOUD_FOLDER,
+  REMOTE_SKETCHBOOK_FOLDER,
+} from '../utils/constants';
 import { CreateUri } from './create-uri';
 
 export type CloudSketchState = 'push' | 'pull';
@@ -128,8 +132,8 @@ export class CreateFeatures implements FrontendApplicationContribution {
       return undefined;
     }
     return dataDirUri
-      .resolve('RemoteSketchbook')
-      .resolve('ArduinoCloud')
+      .resolve(REMOTE_SKETCHBOOK_FOLDER)
+      .resolve(ARDUINO_CLOUD_FOLDER)
       .isEqualOrParent(new URI(sketch.uri));
   }
 

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

@@ -82,6 +82,13 @@ export function isNotFound(err: unknown): err is NotFoundError {
   return isErrorWithStatusOf(err, 404);
 }
 
+export type UnprocessableContentError = CreateError & { status: 422 };
+export function isUnprocessableContent(
+  err: unknown
+): err is UnprocessableContentError {
+  return isErrorWithStatusOf(err, 422);
+}
+
 function isErrorWithStatusOf(
   err: unknown,
   status: number

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

@@ -0,0 +1,15 @@
+import type {
+  MessageBoxOptions,
+  MessageBoxReturnValue,
+  OpenDialogOptions,
+  OpenDialogReturnValue,
+  SaveDialogOptions,
+  SaveDialogReturnValue,
+} from '../electron-common/electron-arduino';
+
+export const DialogService = Symbol('DialogService');
+export interface DialogService {
+  showMessageBox(options: MessageBoxOptions): Promise<MessageBoxReturnValue>;
+  showOpenDialog(options: OpenDialogOptions): Promise<OpenDialogReturnValue>;
+  showSaveDialog(options: SaveDialogOptions): Promise<SaveDialogReturnValue>;
+}

arduino-ide-extension/src/browser/dialogs/certificate-uploader/certificate-add-new.tsx

@@ -1,5 +1,5 @@
 import { nls } from '@theia/core/lib/common';
-import * as React from '@theia/core/shared/react';
+import React from '@theia/core/shared/react';
 
 export const CertificateAddComponent = ({
   addCertificate,

arduino-ide-extension/src/browser/dialogs/certificate-uploader/certificate-list.tsx

@@ -1,4 +1,4 @@
-import * as React from '@theia/core/shared/react';
+import React from '@theia/core/shared/react';
 
 export const CertificateListComponent = ({
   certificates,

arduino-ide-extension/src/browser/dialogs/certificate-uploader/certificate-uploader-component.tsx

@@ -1,20 +1,27 @@
-import * as React from '@theia/core/shared/react';
+import { nls } from '@theia/core/lib/common/nls';
+import React from '@theia/core/shared/react';
 import Tippy from '@tippyjs/react';
-import { AvailableBoard } from '../../boards/boards-service-provider';
-import { CertificateListComponent } from './certificate-list';
-import { SelectBoardComponent } from './select-board-components';
+import type { BoardList } from '../../../common/protocol/board-list';
+import {
+  boardIdentifierEquals,
+  portIdentifierEquals,
+} from '../../../common/protocol/boards-service';
 import { CertificateAddComponent } from './certificate-add-new';
-import { nls } from '@theia/core/lib/common';
+import { CertificateListComponent } from './certificate-list';
+import {
+  BoardOptionValue,
+  SelectBoardComponent,
+} from './select-board-components';
 
 export const CertificateUploaderComponent = ({
-  availableBoards,
+  boardList,
   certificates,
   addCertificate,
   updatableFqbns,
   uploadCertificates,
   openContextMenu,
 }: {
-  availableBoards: AvailableBoard[];
+  boardList: BoardList;
   certificates: string[];
   addCertificate: (cert: string) => void;
   updatableFqbns: string[];
@@ -33,11 +40,15 @@ export const CertificateUploaderComponent = ({
 
   const [selectedCerts, setSelectedCerts] = React.useState<string[]>([]);
 
-  const [selectedBoard, setSelectedBoard] =
-    React.useState<AvailableBoard | null>(null);
+  const [selectedItem, setSelectedItem] =
+    React.useState<BoardOptionValue | null>(null);
 
   const installCertificates = async () => {
-    if (!selectedBoard || !selectedBoard.fqbn || !selectedBoard.port) {
+    if (!selectedItem) {
+      return;
+    }
+    const board = selectedItem.board;
+    if (!board.fqbn) {
       return;
     }
 
@@ -45,8 +56,8 @@ export const CertificateUploaderComponent = ({
 
     try {
       await uploadCertificates(
-        selectedBoard.fqbn,
-        selectedBoard.port.address,
+        board.fqbn,
+        selectedItem.port.address,
         selectedCerts
       );
       setInstallFeedback('ok');
@@ -55,17 +66,26 @@ export const CertificateUploaderComponent = ({
     }
   };
 
-  const onBoardSelect = React.useCallback(
-    (board: AvailableBoard) => {
-      const newFqbn = (board && board.fqbn) || null;
-      const prevFqbn = (selectedBoard && selectedBoard.fqbn) || null;
+  const onItemSelect = React.useCallback(
+    (item: BoardOptionValue | null) => {
+      if (!item) {
+        setSelectedItem(null);
+        return;
+      }
+      const board = item.board;
+      const port = item.port;
+      const selectedBoard = selectedItem?.board;
+      const selectedPort = selectedItem?.port;
 
-      if (newFqbn !== prevFqbn) {
+      if (
+        !boardIdentifierEquals(board, selectedBoard) ||
+        !portIdentifierEquals(port, selectedPort)
+      ) {
         setInstallFeedback(null);
-        setSelectedBoard(board);
+        setSelectedItem(item);
       }
     },
-    [selectedBoard]
+    [selectedItem]
   );
 
   return (
@@ -125,10 +145,10 @@ export const CertificateUploaderComponent = ({
         <div className="dialogRow">
           <div className="fl1">
             <SelectBoardComponent
-              availableBoards={availableBoards}
+              boardList={boardList}
               updatableFqbns={updatableFqbns}
-              onBoardSelect={onBoardSelect}
-              selectedBoard={selectedBoard}
+              onItemSelect={onItemSelect}
+              selectedItem={selectedItem}
               busy={installFeedback === 'installing'}
             />
           </div>
@@ -167,7 +187,7 @@ export const CertificateUploaderComponent = ({
             type="button"
             className="theia-button primary install-cert-btn"
             onClick={installCertificates}
-            disabled={selectedCerts.length === 0 || !selectedBoard}
+            disabled={selectedCerts.length === 0 || !selectedItem}
           >
             {nls.localize('arduino/certificate/upload', 'Upload')}
           </button>

arduino-ide-extension/src/browser/dialogs/certificate-uploader/certificate-uploader-dialog.tsx

@@ -1,62 +1,51 @@
-import * as React from '@theia/core/shared/react';
+import { DialogProps } from '@theia/core/lib/browser/dialogs';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import {
+  PreferenceScope,
+  PreferenceService,
+} from '@theia/core/lib/browser/preferences/preference-service';
+import { ReactWidget } from '@theia/core/lib/browser/widgets/react-widget';
+import { CommandRegistry } from '@theia/core/lib/common/command';
+import { nls } from '@theia/core/lib/common/nls';
+import type { Message } from '@theia/core/shared/@phosphor/messaging';
+import { Widget } from '@theia/core/shared/@phosphor/widgets';
 import {
   inject,
   injectable,
   postConstruct,
 } from '@theia/core/shared/inversify';
-import { DialogProps } from '@theia/core/lib/browser/dialogs';
-import { AbstractDialog } from '../../theia/dialogs/dialogs';
-import { Widget } from '@theia/core/shared/@phosphor/widgets';
-import { Message } from '@theia/core/shared/@phosphor/messaging';
-import { ReactWidget } from '@theia/core/lib/browser/widgets/react-widget';
-import {
-  AvailableBoard,
-  BoardsServiceProvider,
-} from '../../boards/boards-service-provider';
-import { CertificateUploaderComponent } from './certificate-uploader-component';
-import { ArduinoPreferences } from '../../arduino-preferences';
-import {
-  PreferenceScope,
-  PreferenceService,
-} from '@theia/core/lib/browser/preferences/preference-service';
-import { CommandRegistry } from '@theia/core/lib/common/command';
-import { certificateList, sanifyCertString } from './utils';
+import React from '@theia/core/shared/react';
 import { ArduinoFirmwareUploader } from '../../../common/protocol/arduino-firmware-uploader';
-import { nls } from '@theia/core/lib/common';
-import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import { createBoardList } from '../../../common/protocol/board-list';
+import { ArduinoPreferences } from '../../arduino-preferences';
+import { BoardsServiceProvider } from '../../boards/boards-service-provider';
+import { AbstractDialog } from '../../theia/dialogs/dialogs';
+import { CertificateUploaderComponent } from './certificate-uploader-component';
+import { certificateList, sanifyCertString } from './utils';
 
 @injectable()
 export class UploadCertificateDialogWidget extends ReactWidget {
   @inject(BoardsServiceProvider)
-  protected readonly boardsServiceClient: BoardsServiceProvider;
-
+  private readonly boardsServiceProvider: BoardsServiceProvider;
   @inject(ArduinoPreferences)
-  protected readonly arduinoPreferences: ArduinoPreferences;
-
+  private readonly arduinoPreferences: ArduinoPreferences;
   @inject(PreferenceService)
-  protected readonly preferenceService: PreferenceService;
-
+  private readonly preferenceService: PreferenceService;
   @inject(CommandRegistry)
-  protected readonly commandRegistry: CommandRegistry;
-
+  private readonly commandRegistry: CommandRegistry;
   @inject(ArduinoFirmwareUploader)
-  protected readonly arduinoFirmwareUploader: ArduinoFirmwareUploader;
-
+  private readonly arduinoFirmwareUploader: ArduinoFirmwareUploader;
   @inject(FrontendApplicationStateService)
   private readonly appStateService: FrontendApplicationStateService;
 
-  protected certificates: string[] = [];
-  protected updatableFqbns: string[] = [];
-  protected availableBoards: AvailableBoard[] = [];
+  private certificates: string[] = [];
+  private updatableFqbns: string[] = [];
+  private boardList = createBoardList({});
 
-  public busyCallback = (busy: boolean) => {
+  busyCallback = (busy: boolean) => {
     return;
   };
 
-  constructor() {
-    super();
-  }
-
   @postConstruct()
   protected init(): void {
     this.arduinoPreferences.ready.then(() => {
@@ -81,8 +70,8 @@ export class UploadCertificateDialogWidget extends ReactWidget {
       })
     );
 
-    this.boardsServiceClient.onAvailableBoardsChanged((availableBoards) => {
-      this.availableBoards = availableBoards;
+    this.boardsServiceProvider.onBoardListDidChange((boardList) => {
+      this.boardList = boardList;
       this.update();
     });
   }
@@ -126,7 +115,7 @@ export class UploadCertificateDialogWidget extends ReactWidget {
   protected render(): React.ReactNode {
     return (
       <CertificateUploaderComponent
-        availableBoards={this.availableBoards}
+        boardList={this.boardList}
         certificates={this.certificates}
         updatableFqbns={this.updatableFqbns}
         addCertificate={this.addCertificate.bind(this)}
@@ -143,7 +132,7 @@ export class UploadCertificateDialogProps extends DialogProps {}
 @injectable()
 export class UploadCertificateDialog extends AbstractDialog<void> {
   @inject(UploadCertificateDialogWidget)
-  protected readonly widget: UploadCertificateDialogWidget;
+  private readonly widget: UploadCertificateDialogWidget;
 
   private busy = false;
 

arduino-ide-extension/src/browser/dialogs/certificate-uploader/select-board-components.tsx

@@ -1,37 +1,37 @@
 import { nls } from '@theia/core/lib/common';
-import * as React from '@theia/core/shared/react';
-import { AvailableBoard } from '../../boards/boards-service-provider';
+import React from '@theia/core/shared/react';
+import {
+  boardListItemEquals,
+  type BoardList,
+  type BoardListItemWithBoard,
+} from '../../../common/protocol/board-list';
 import { ArduinoSelect } from '../../widgets/arduino-select';
 
-type BoardOption = { value: string; label: string };
+export type BoardOptionValue = BoardListItemWithBoard;
+type BoardOption = { value: BoardOptionValue | undefined; label: string };
 
 export const SelectBoardComponent = ({
-  availableBoards,
+  boardList,
   updatableFqbns,
-  onBoardSelect,
-  selectedBoard,
+  onItemSelect,
+  selectedItem,
   busy,
 }: {
-  availableBoards: AvailableBoard[];
+  boardList: BoardList;
   updatableFqbns: string[];
-  onBoardSelect: (board: AvailableBoard | null) => void;
-  selectedBoard: AvailableBoard | null;
+  onItemSelect: (item: BoardOptionValue | null) => void;
+  selectedItem: BoardOptionValue | null;
   busy: boolean;
 }): React.ReactElement => {
   const [selectOptions, setSelectOptions] = React.useState<BoardOption[]>([]);
 
-  const [selectBoardPlaceholder, setSelectBoardPlaceholder] =
-    React.useState('');
+  const [selectItemPlaceholder, setSelectBoardPlaceholder] = React.useState('');
 
   const selectOption = React.useCallback(
-    (boardOpt: BoardOption) => {
-      onBoardSelect(
-        (boardOpt &&
-          availableBoards.find((board) => board.fqbn === boardOpt.value)) ||
-          null
-      );
+    (boardOpt: BoardOption | null) => {
+      onItemSelect(boardOpt?.value ?? null);
     },
-    [availableBoards, onBoardSelect]
+    [onItemSelect]
   );
 
   React.useEffect(() => {
@@ -44,26 +44,28 @@ export const SelectBoardComponent = ({
       'arduino/certificate/selectBoard',
       'Select a board...'
     );
+    const updatableBoards = boardList.boards.filter((item) => {
+      const fqbn = item.board.fqbn;
+      return fqbn && updatableFqbns.includes(fqbn);
+    });
     let selBoard = -1;
-    const updatableBoards = availableBoards.filter(
-      (board) => board.port && board.fqbn && updatableFqbns.includes(board.fqbn)
-    );
-    const boardsList: BoardOption[] = updatableBoards.map((board, i) => {
-      if (board.selected) {
+
+    const boardOptions: BoardOption[] = updatableBoards.map((item, i) => {
+      if (selectedItem === item) {
         selBoard = i;
       }
       return {
         label: nls.localize(
           'arduino/certificate/boardAtPort',
           '{0} at {1}',
-          board.name,
-          board.port?.address ?? ''
+          item.board.name,
+          item.port.address ?? ''
         ),
-        value: board.fqbn || '',
+        value: item,
       };
     });
 
-    if (boardsList.length === 0) {
+    if (boardOptions.length === 0) {
       placeholderTxt = nls.localize(
         'arduino/certificate/noSupportedBoardConnected',
         'No supported board connected'
@@ -71,32 +73,31 @@ export const SelectBoardComponent = ({
     }
 
     setSelectBoardPlaceholder(placeholderTxt);
-    setSelectOptions(boardsList);
+    setSelectOptions(boardOptions);
 
-    if (selectedBoard) {
-      selBoard = boardsList
-        .map((boardOpt) => boardOpt.value)
-        .indexOf(selectedBoard.fqbn || '');
+    if (selectedItem) {
+      selBoard = updatableBoards.findIndex((board) =>
+        boardListItemEquals(board, selectedItem)
+      );
     }
 
-    selectOption(boardsList[selBoard] || null);
-  }, [busy, availableBoards, selectOption, updatableFqbns, selectedBoard]);
-
+    selectOption(boardOptions[selBoard] || null);
+  }, [busy, boardList, selectOption, updatableFqbns, selectedItem]);
   return (
     <ArduinoSelect
       id="board-select"
       menuPosition="fixed"
       isDisabled={selectOptions.length === 0 || busy}
-      placeholder={selectBoardPlaceholder}
+      placeholder={selectItemPlaceholder}
       options={selectOptions}
       value={
-        (selectedBoard && {
-          value: selectedBoard.fqbn,
+        (selectedItem && {
+          value: selectedItem,
           label: nls.localize(
             'arduino/certificate/boardAtPort',
             '{0} at {1}',
-            selectedBoard.name,
-            selectedBoard.port?.address ?? ''
+            selectedItem.board.name,
+            selectedItem.port.address ?? ''
           ),
         }) ||
         null

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

@@ -1,12 +1,14 @@
-import * as React from '@theia/core/shared/react';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { Widget } from '@theia/core/shared/@phosphor/widgets';
+import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
+import { DialogProps } from '@theia/core/lib/browser/dialogs';
+import { TreeNode } from '@theia/core/lib/browser/tree/tree';
+import { ReactWidget } from '@theia/core/lib/browser/widgets/react-widget';
+import { nls } from '@theia/core/lib/common/nls';
+import { MaybePromise } from '@theia/core/lib/common/types';
 import { Message } from '@theia/core/shared/@phosphor/messaging';
-import { clipboard } from '@theia/core/electron-shared/@electron/remote';
-import { ReactWidget, DialogProps } from '@theia/core/lib/browser';
-import { AbstractDialog } from '../theia/dialogs/dialogs';
+import { Widget } from '@theia/core/shared/@phosphor/widgets';
+import React from '@theia/core/shared/react';
 import { CreateApi } from '../create/create-api';
-import { nls } from '@theia/core/lib/common';
+import { AbstractDialog } from '../theia/dialogs/dialogs';
 
 const RadioButton = (props: {
   id: string;
@@ -35,15 +37,18 @@ export const ShareSketchComponent = ({
   treeNode,
   createApi,
   domain = 'https://create.arduino.cc',
+  writeClipboard,
 }: {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   treeNode: any;
   createApi: CreateApi;
   domain?: string;
+  writeClipboard: (text: string) => MaybePromise<void>;
 }): React.ReactElement => {
-  const [loading, setloading] = React.useState<boolean>(false);
+  const [loading, setLoading] = React.useState<boolean>(false);
 
   const radioChangeHandler = async (event: React.BaseSyntheticEvent) => {
-    setloading(true);
+    setLoading(true);
     const sketch = await createApi.editSketch({
       id: treeNode.sketchId,
       params: {
@@ -52,7 +57,7 @@ export const ShareSketchComponent = ({
     });
     // setPublicVisibility(sketch.is_public);
     treeNode.isPublic = sketch.is_public;
-    setloading(false);
+    setLoading(false);
   };
 
   const sketchLink = `${domain}/editor/_/${treeNode.sketchId}/preview`;
@@ -100,7 +105,7 @@ export const ShareSketchComponent = ({
               className="theia-input"
             />
             <button
-              onClick={() => clipboard.writeText(sketchLink)}
+              onClick={() => writeClipboard(sketchLink)}
               value="copy"
               className="theia-button secondary"
             >
@@ -121,44 +126,52 @@ export const ShareSketchComponent = ({
   );
 };
 
-@injectable()
 export class ShareSketchWidget extends ReactWidget {
-  constructor(private treeNode: any, private createApi: CreateApi) {
+  private readonly writeClipboard = (text: string) =>
+    this.clipboardService.writeText(text);
+
+  constructor(
+    private treeNode: TreeNode,
+    private createApi: CreateApi,
+    private clipboardService: ClipboardService
+  ) {
     super();
   }
 
-  protected render(): React.ReactNode {
+  protected override render(): React.ReactNode {
     return (
       <ShareSketchComponent
         treeNode={this.treeNode}
         createApi={this.createApi}
+        writeClipboard={this.writeClipboard}
       />
     );
   }
 }
 
-@injectable()
 export class ShareSketchDialogProps extends DialogProps {
-  readonly node: any;
+  readonly node: TreeNode;
   readonly createApi: CreateApi;
+  readonly clipboardService: ClipboardService;
 }
 
-@injectable()
 export class ShareSketchDialog extends AbstractDialog<void> {
   protected widget: ShareSketchWidget;
 
-  constructor(
-    @inject(ShareSketchDialogProps)
-    protected override readonly props: ShareSketchDialogProps
-  ) {
+  constructor(protected override readonly props: ShareSketchDialogProps) {
     super({ title: props.title });
     this.contentNode.classList.add('arduino-share-sketch-dialog');
-    this.widget = new ShareSketchWidget(props.node, props.createApi);
+    this.widget = new ShareSketchWidget(
+      props.node,
+      props.createApi,
+      props.clipboardService
+    );
   }
 
-  get value(): void {
+  override get value(): void {
     return;
   }
+
   protected override onAfterAttach(msg: Message): void {
     if (this.widget.isAttached) {
       Widget.detach(this.widget);

arduino-ide-extension/src/browser/dialogs/firmware-uploader/firmware-uploader-component.tsx

@@ -1,24 +1,31 @@
 import { nls } from '@theia/core/lib/common';
-import * as React from '@theia/core/shared/react';
-import { Port } from '../../../common/protocol';
+import React from '@theia/core/shared/react';
+import {
+  boardIdentifierEquals,
+  Port,
+  portIdentifierEquals,
+} from '../../../common/protocol';
 import {
   ArduinoFirmwareUploader,
   FirmwareInfo,
 } from '../../../common/protocol/arduino-firmware-uploader';
-import { AvailableBoard } from '../../boards/boards-service-provider';
+import type {
+  BoardList,
+  BoardListItemWithBoard,
+} from '../../../common/protocol/board-list';
 import { ArduinoSelect } from '../../widgets/arduino-select';
 import { SelectBoardComponent } from '../certificate-uploader/select-board-components';
 
 type FirmwareOption = { value: string; label: string };
 
 export const FirmwareUploaderComponent = ({
-  availableBoards,
+  boardList,
   firmwareUploader,
   updatableFqbns,
   flashFirmware,
   isOpen,
 }: {
-  availableBoards: AvailableBoard[];
+  boardList: BoardList;
   firmwareUploader: ArduinoFirmwareUploader;
   updatableFqbns: string[];
   flashFirmware: (firmware: FirmwareInfo, port: Port) => Promise<any>;
@@ -31,8 +38,8 @@ export const FirmwareUploaderComponent = ({
     'ok' | 'fail' | 'installing' | null
   >(null);
 
-  const [selectedBoard, setSelectedBoard] =
-    React.useState<AvailableBoard | null>(null);
+  const [selectedItem, setSelectedItem] =
+    React.useState<BoardListItemWithBoard | null>(null);
 
   const [availableFirmwares, setAvailableFirmwares] = React.useState<
     FirmwareInfo[]
@@ -50,13 +57,14 @@ export const FirmwareUploaderComponent = ({
   const fetchFirmwares = React.useCallback(async () => {
     setInstallFeedback(null);
     setFirmwaresFetching(true);
-    if (!selectedBoard) {
+    if (!selectedItem) {
       return;
     }
 
     // fetch the firmwares for the selected board
+    const board = selectedItem.board;
     const firmwaresForFqbn = await firmwareUploader.availableFirmwares(
-      selectedBoard.fqbn || ''
+      board.fqbn || ''
     );
     setAvailableFirmwares(firmwaresForFqbn);
 
@@ -69,7 +77,7 @@ export const FirmwareUploaderComponent = ({
 
     if (firmwaresForFqbn.length > 0) setSelectedFirmware(firmwaresOpts[0]);
     setFirmwaresFetching(false);
-  }, [firmwareUploader, selectedBoard]);
+  }, [firmwareUploader, selectedItem]);
 
   const installFirmware = React.useCallback(async () => {
     setInstallFeedback('installing');
@@ -78,30 +86,42 @@ export const FirmwareUploaderComponent = ({
       (firmware) => firmware.firmware_version === selectedFirmware?.value
     );
 
+    const selectedBoard = selectedItem?.board;
+    const selectedPort = selectedItem?.port;
     try {
       const installStatus =
-        !!firmwareToFlash &&
-        !!selectedBoard?.port &&
-        (await flashFirmware(firmwareToFlash, selectedBoard?.port));
+        firmwareToFlash &&
+        selectedBoard &&
+        selectedPort &&
+        (await flashFirmware(firmwareToFlash, selectedPort));
 
       setInstallFeedback((installStatus && 'ok') || 'fail');
     } catch {
       setInstallFeedback('fail');
     }
-  }, [firmwareUploader, selectedBoard, selectedFirmware, availableFirmwares]);
+  }, [selectedItem, selectedFirmware, availableFirmwares, flashFirmware]);
 
-  const onBoardSelect = React.useCallback(
-    (board: AvailableBoard) => {
-      const newFqbn = (board && board.fqbn) || null;
-      const prevFqbn = (selectedBoard && selectedBoard.fqbn) || null;
+  const onItemSelect = React.useCallback(
+    (item: BoardListItemWithBoard | null) => {
+      if (!item) {
+        setSelectedItem(null);
+        return;
+      }
+      const board = item.board;
+      const port = item.port;
+      const selectedBoard = selectedItem?.board;
+      const selectedPort = selectedItem?.port;
 
-      if (newFqbn !== prevFqbn) {
+      if (
+        !boardIdentifierEquals(board, selectedBoard) ||
+        !portIdentifierEquals(port, selectedPort)
+      ) {
         setInstallFeedback(null);
         setAvailableFirmwares([]);
-        setSelectedBoard(board);
+        setSelectedItem(item);
       }
     },
-    [selectedBoard]
+    [selectedItem]
   );
 
   return (
@@ -115,10 +135,10 @@ export const FirmwareUploaderComponent = ({
         <div className="dialogRow">
           <div className="fl1">
             <SelectBoardComponent
-              availableBoards={availableBoards}
+              boardList={boardList}
               updatableFqbns={updatableFqbns}
-              onBoardSelect={onBoardSelect}
-              selectedBoard={selectedBoard}
+              onItemSelect={onItemSelect}
+              selectedItem={selectedItem}
               busy={installFeedback === 'installing'}
             />
           </div>
@@ -126,7 +146,7 @@ export const FirmwareUploaderComponent = ({
             type="button"
             className="theia-button secondary"
             disabled={
-              selectedBoard === null ||
+              selectedItem === null ||
               firmwaresFetching ||
               installFeedback === 'installing'
             }
@@ -150,14 +170,14 @@ export const FirmwareUploaderComponent = ({
                 id="firmware-select"
                 menuPosition="fixed"
                 isDisabled={
-                  !selectedBoard ||
+                  !selectedItem ||
                   firmwaresFetching ||
                   installFeedback === 'installing'
                 }
                 options={firmwareOptions}
                 value={selectedFirmware}
                 tabSelectsValue={false}
-                onChange={(value) => {
+                onChange={(value: FirmwareOption | null) => {
                   if (value) {
                     setInstallFeedback(null);
                     setSelectedFirmware(value);

arduino-ide-extension/src/browser/dialogs/firmware-uploader/firmware-uploader-dialog.tsx

@@ -1,24 +1,21 @@
-import * as React from '@theia/core/shared/react';
+import { DialogProps } from '@theia/core/lib/browser/dialogs';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import type { Message } from '@theia/core/shared/@phosphor/messaging';
 import {
   inject,
   injectable,
   postConstruct,
 } from '@theia/core/shared/inversify';
-import { DialogProps } from '@theia/core/lib/browser/dialogs';
-import { ReactDialog } from '../../theia/dialogs/dialogs';
-import { Message } from '@theia/core/shared/@phosphor/messaging';
-import {
-  AvailableBoard,
-  BoardsServiceProvider,
-} from '../../boards/boards-service-provider';
+import React from '@theia/core/shared/react';
 import {
   ArduinoFirmwareUploader,
   FirmwareInfo,
 } from '../../../common/protocol/arduino-firmware-uploader';
-import { FirmwareUploaderComponent } from './firmware-uploader-component';
+import type { Port } from '../../../common/protocol/boards-service';
+import { BoardsServiceProvider } from '../../boards/boards-service-provider';
 import { UploadFirmware } from '../../contributions/upload-firmware';
-import { Port } from '../../../common/protocol';
-import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import { ReactDialog } from '../../theia/dialogs/dialogs';
+import { FirmwareUploaderComponent } from './firmware-uploader-component';
 
 @injectable()
 export class UploadFirmwareDialogProps extends DialogProps {}
@@ -26,14 +23,13 @@ export class UploadFirmwareDialogProps extends DialogProps {}
 @injectable()
 export class UploadFirmwareDialog extends ReactDialog<void> {
   @inject(BoardsServiceProvider)
-  private readonly boardsServiceClient: BoardsServiceProvider;
+  private readonly boardsServiceProvider: BoardsServiceProvider;
   @inject(ArduinoFirmwareUploader)
   private readonly arduinoFirmwareUploader: ArduinoFirmwareUploader;
   @inject(FrontendApplicationStateService)
-  private readonly appStatusService: FrontendApplicationStateService;
+  private readonly appStateService: FrontendApplicationStateService;
 
   private updatableFqbns: string[] = [];
-  private availableBoards: AvailableBoard[] = [];
   private isOpen = new Object();
   private busy = false;
 
@@ -49,16 +45,12 @@ export class UploadFirmwareDialog extends ReactDialog<void> {
 
   @postConstruct()
   protected init(): void {
-    this.appStatusService.reachedState('ready').then(async () => {
+    this.appStateService.reachedState('ready').then(async () => {
       const fqbns = await this.arduinoFirmwareUploader.updatableBoards();
       this.updatableFqbns = fqbns;
       this.update();
     });
-
-    this.boardsServiceClient.onAvailableBoardsChanged((availableBoards) => {
-      this.availableBoards = availableBoards;
-      this.update();
-    });
+    this.boardsServiceProvider.onBoardListDidChange(() => this.update());
   }
 
   get value(): void {
@@ -70,7 +62,7 @@ export class UploadFirmwareDialog extends ReactDialog<void> {
       <div>
         <form>
           <FirmwareUploaderComponent
-            availableBoards={this.availableBoards}
+            boardList={this.boardsServiceProvider.boardList}
             firmwareUploader={this.arduinoFirmwareUploader}
             flashFirmware={this.flashFirmware.bind(this)}
             updatableFqbns={this.updatableFqbns}

arduino-ide-extension/src/browser/dialogs/ide-updater/ide-updater-component.tsx

@@ -1,10 +1,15 @@
-import { nls } from '@theia/core/lib/common';
-import { shell } from '@theia/core/electron-shared/@electron/remote';
-import * as React from '@theia/core/shared/react';
-import ReactMarkdown from 'react-markdown';
+import { nls } from '@theia/core/lib/common/nls';
+import React from '@theia/core/shared/react';
+// @ts-expect-error see https://github.com/microsoft/TypeScript/issues/49721#issuecomment-1319854183
+import type { Options } from 'react-markdown';
 import { ProgressInfo, UpdateInfo } from '../../../common/protocol/ide-updater';
 import ProgressBar from '../../components/ProgressBar';
 
+const ReactMarkdown = React.lazy<React.ComponentType<Options>>(
+  // @ts-expect-error see above
+  () => import('react-markdown')
+);
+
 export interface UpdateProgress {
   progressInfo?: ProgressInfo | undefined;
   downloadFinished?: boolean;
@@ -15,6 +20,7 @@ export interface UpdateProgress {
 export interface IDEUpdaterComponentProps {
   updateInfo: UpdateInfo;
   updateProgress: UpdateProgress;
+  openExternal: (url: string) => undefined;
 }
 
 export const IDEUpdaterComponent = ({
@@ -25,6 +31,7 @@ export const IDEUpdaterComponent = ({
     progressInfo,
     error,
   },
+  openExternal,
 }: IDEUpdaterComponentProps): React.ReactElement => {
   const { version, releaseNotes } = updateInfo;
   const [changelog, setChangelog] = React.useState<string>('');
@@ -95,13 +102,17 @@ export const IDEUpdaterComponent = ({
         {changelog && (
           <div className="dialogRow changelog-container">
             <div className="changelog">
+              <React.Suspense
+                fallback={
+                  <div className="fallback">
+                    <div className="spinner" />
+                  </div>
+                }
+              >
                 <ReactMarkdown
                   components={{
                     a: ({ href, children, ...props }) => (
-                    <a
-                      onClick={() => href && shell.openExternal(href)}
-                      {...props}
-                    >
+                      <a onClick={() => href && openExternal(href)} {...props}>
                         {children}
                       </a>
                     ),
@@ -109,6 +120,7 @@ export const IDEUpdaterComponent = ({
                 >
                   {changelog}
                 </ReactMarkdown>
+              </React.Suspense>
             </div>
           </div>
         )}

arduino-ide-extension/src/browser/dialogs/ide-updater/ide-updater-dialog.tsx

@@ -1,4 +1,4 @@
-import * as React from '@theia/core/shared/react';
+import React from '@theia/core/shared/react';
 import {
   inject,
   injectable,
@@ -18,8 +18,6 @@ import {
 import { LocalStorageService } from '@theia/core/lib/browser';
 import { WindowService } from '@theia/core/lib/browser/window/window-service';
 
-const DOWNLOAD_PAGE_URL = 'https://www.arduino.cc/en/software';
-
 @injectable()
 export class IDEUpdaterDialogProps extends DialogProps {}
 
@@ -76,11 +74,15 @@ export class IDEUpdaterDialog extends ReactDialog<UpdateInfo | undefined> {
         <IDEUpdaterComponent
           updateInfo={this.updateInfo}
           updateProgress={this.updateProgress}
+          openExternal={this.openExternal}
         />
       )
     );
   }
 
+  private readonly openExternal = (url: string) =>
+    this.windowService.openNewWindow(url, { external: true });
+
   get value(): UpdateInfo | undefined {
     return this.updateInfo;
   }
@@ -164,7 +166,7 @@ export class IDEUpdaterDialog extends ReactDialog<UpdateInfo | undefined> {
   }
 
   private openDownloadPage(): void {
-    this.windowService.openNewWindow(DOWNLOAD_PAGE_URL, { external: true });
+    this.openExternal('https://www.arduino.cc/en/software');
     this.close();
   }
 

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

@@ -1,4 +1,4 @@
-import * as React from '@theia/core/shared/react';
+import React from '@theia/core/shared/react';
 import { Tab, Tabs, TabList, TabPanel } from 'react-tabs';
 import 'react-tabs/style/react-tabs.css';
 import { Disable } from 'react-disable';
@@ -24,6 +24,12 @@ import {
 } from '@theia/core/lib/common/i18n/localization';
 import SettingsStepInput from './settings-step-input';
 import { InterfaceScale } from '../../contributions/interface-scale';
+import {
+  userConfigurableThemes,
+  themeLabelForSettings,
+  arduinoThemeTypeOf,
+} from '../../theia/core/theming';
+import { Theme } from '@theia/core/lib/common/theme';
 
 const maxScale = InterfaceScale.ZoomLevel.toPercentage(
   InterfaceScale.ZoomLevel.MAX
@@ -218,14 +224,10 @@ export class SettingsComponent extends React.Component<
             <div className="flex-line">
               <select
                 className="theia-select"
-                value={this.props.themeService.getCurrentTheme().label}
+                value={this.currentThemeLabel}
                 onChange={this.themeDidChange}
               >
-                {this.props.themeService.getThemes().map(({ id, label }) => (
-                  <option key={id} value={label}>
-                    {label}
-                  </option>
-                ))}
+                {this.themeSelectOptions}
               </select>
             </div>
             <div className="flex-line">
@@ -333,6 +335,46 @@ export class SettingsComponent extends React.Component<
     );
   }
 
+  private get currentThemeLabel(): string {
+    const currentTheme = this.props.themeService.getCurrentTheme();
+    return themeLabelForSettings(currentTheme);
+  }
+
+  private get separatedThemes(): (Theme | string)[] {
+    const separatedThemes: (Theme | string)[] = [];
+    const groupedThemes = userConfigurableThemes(this.props.themeService);
+    for (const group of groupedThemes) {
+      for (let i = 0; i < group.length; i++) {
+        const theme = group[i];
+        if (i === 0 && separatedThemes.length) {
+          const arduinoThemeType = arduinoThemeTypeOf(theme);
+          separatedThemes.push(`separator-${arduinoThemeType}`);
+        }
+        separatedThemes.push(theme);
+      }
+    }
+    return separatedThemes;
+  }
+
+  private get themeSelectOptions(): React.ReactNode[] {
+    return this.separatedThemes.map((item) => {
+      if (typeof item === 'string') {
+        return (
+          // &#9472; -> BOX DRAWINGS LIGHT HORIZONTAL
+          <option key={item} disabled>
+            &#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;
+          </option>
+        );
+      }
+      const label = themeLabelForSettings(item);
+      return (
+        <option key={item.id} value={label}>
+          {label}
+        </option>
+      );
+    });
+  }
+
   private toSelectOptions(language: string | LanguageInfo): JSX.Element {
     const plain = typeof language === 'string';
     const key = plain ? language : language.languageId;
@@ -610,8 +652,8 @@ export class SettingsComponent extends React.Component<
     event: React.ChangeEvent<HTMLSelectElement>
   ): void => {
     const { selectedIndex } = event.target.options;
-    const theme = this.props.themeService.getThemes()[selectedIndex];
-    if (theme) {
+    const theme = this.separatedThemes[selectedIndex];
+    if (theme && typeof theme !== 'string') {
       this.setState({ themeId: theme.id });
       if (this.props.themeService.getCurrentTheme().id !== theme.id) {
         this.props.themeService.setCurrentTheme(theme.id);

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

@@ -1,4 +1,4 @@
-import * as React from '@theia/core/shared/react';
+import React from '@theia/core/shared/react';
 import {
   injectable,
   inject,

arduino-ide-extension/src/browser/dialogs/settings/settings-step-input.tsx

@@ -1,4 +1,4 @@
-import * as React from '@theia/core/shared/react';
+import React from '@theia/core/shared/react';
 import classnames from 'classnames';
 
 interface SettingsStepInputProps {

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

@@ -117,12 +117,23 @@ export class SettingsService {
   protected _settings: Settings;
 
   @postConstruct()
-  protected async init(): Promise<void> {
+  protected init(): void {
     this.appStateService.reachedState('ready').then(async () => {
       const settings = await this.loadSettings();
       this._settings = deepClone(settings);
       this.ready.resolve();
     });
+    this.preferenceService.onPreferenceChanged(async (event) => {
+      await this.ready.promise;
+      const { preferenceName, newValue } = event;
+      if (
+        preferenceName === 'workbench.colorTheme' &&
+        typeof newValue === 'string' &&
+        this._settings.themeId !== newValue
+      ) {
+        this.reset();
+      }
+    });
   }
 
   protected async loadSettings(): Promise<Settings> {

arduino-ide-extension/src/browser/dialogs/user-fields/user-fields-component.tsx

@@ -1,4 +1,4 @@
-import * as React from '@theia/core/shared/react';
+import React from '@theia/core/shared/react';
 import { BoardUserField } from '../../../common/protocol';
 import { nls } from '@theia/core/lib/common';
 

arduino-ide-extension/src/browser/dialogs/user-fields/user-fields-dialog.tsx

@@ -1,4 +1,4 @@
-import * as React from '@theia/core/shared/react';
+import React from '@theia/core/shared/react';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { DialogProps } from '@theia/core/lib/browser/dialogs';
 import { Message } from '@theia/core/shared/@phosphor/messaging';