chore: switch to version 2.3.7 after the release (#2701)

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

.eslintrc.js

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

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -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
@@ -30,7 +30,7 @@ body:
       description: |
         Which version of the Arduino IDE are you using?
         See **Help > About Arduino IDE** in the Arduino IDE menus (**Arduino IDE > About Arduino IDE** on macOS).
-        This should be the latest [nightly build](https://github.com/arduino/arduino-ide#nightly-builds).
+        This should be the latest [nightly build](https://www.arduino.cc/en/software#nightly-builds).
     validations:
       required: true
   - type: dropdown
@@ -68,7 +68,7 @@ body:
       options:
         - label: I searched for previous reports in [the issue tracker](https://github.com/arduino/arduino-ide/issues?q=)
           required: true
-        - label: I verified the problem still occurs when using the latest [nightly build](https://github.com/arduino/arduino-ide#nightly-builds)
+        - label: I verified the problem still occurs when using the latest [nightly build](https://www.arduino.cc/en/software#nightly-builds)
           required: true
         - label: My report contains all necessary details
           required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -8,6 +8,12 @@ contact_links:
   - name: Support request
     url: https://forum.arduino.cc/
     about: We can help you out on the Arduino Forum!
+  - name: Issue report guide
+    url: https://github.com/arduino/arduino-ide/blob/main/docs/contributor-guide/issues.md#issue-report-guide
+    about: Learn about submitting issue reports to this repository.
+  - name: Contributor guide
+    url: https://github.com/arduino/arduino-ide/blob/main/docs/CONTRIBUTING.md#contributor-guide
+    about: Learn about contributing to this project.
   - name: Discuss development work on the project
     url: https://groups.google.com/a/arduino.cc/g/developers
     about: Arduino Developers Mailing List

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,7 +1,7 @@
 name: Feature request
 description: Suggest an enhancement to this project.
 labels:
-  - "type: enhancement"
+  - 'type: enhancement'
 body:
   - type: textarea
     id: description
@@ -25,7 +25,7 @@ body:
       description: |
         Which version of the Arduino IDE are you using?
         See **Help > About Arduino IDE** in the Arduino IDE menus (**Arduino IDE > About Arduino IDE** on macOS).
-        This should be the latest [nightly build](https://github.com/arduino/arduino-ide#nightly-builds).
+        This should be the latest [nightly build](https://www.arduino.cc/en/software#nightly-builds).
     validations:
       required: true
   - type: dropdown
@@ -63,7 +63,7 @@ body:
       options:
         - label: I searched for previous requests in [the issue tracker](https://github.com/arduino/arduino-ide/issues?q=)
           required: true
-        - label: I verified the feature was still missing when using the latest [nightly build](https://github.com/arduino/arduino-ide#nightly-builds)
+        - label: I verified the feature was still missing when using the latest [nightly build](https://www.arduino.cc/en/software#nightly-builds)
           required: true
         - label: My request contains all necessary details
           required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -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

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

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

@@ -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/tools/fetch_athena_stats.py

@@ -1,131 +0,0 @@
-import boto3
-import semver
-import os
-import logging
-import uuid
-import time
-
-
-# logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
-log = logging.getLogger()
-logging.getLogger("boto3").setLevel(logging.CRITICAL)
-logging.getLogger("botocore").setLevel(logging.CRITICAL)
-logging.getLogger("urllib3").setLevel(logging.CRITICAL)
-
-
-def execute(client, statement, dest_s3_output_location):
-    log.info("execute query: {} dumping in {}".format(statement, dest_s3_output_location))
-    result = client.start_query_execution(
-        QueryString=statement,
-        ClientRequestToken=str(uuid.uuid4()),
-        ResultConfiguration={
-            "OutputLocation": dest_s3_output_location,
-        },
-    )
-    execution_id = result["QueryExecutionId"]
-    log.info("wait for query {} completion".format(execution_id))
-    wait_for_query_execution_completion(client, execution_id)
-    log.info("operation successful")
-    return execution_id
-
-
-def wait_for_query_execution_completion(client, query_execution_id):
-    query_ended = False
-    while not query_ended:
-        query_execution = client.get_query_execution(QueryExecutionId=query_execution_id)
-        state = query_execution["QueryExecution"]["Status"]["State"]
-        if state == "SUCCEEDED":
-            query_ended = True
-        elif state in ["FAILED", "CANCELLED"]:
-            raise BaseException(
-                "query failed or canceled: {}".format(query_execution["QueryExecution"]["Status"]["StateChangeReason"])
-            )
-        else:
-            time.sleep(1)
-
-
-def valid(key):
-    split = key.split("_")
-    if len(split) < 1:
-        return False
-    try:
-        semver.parse(split[0])
-    except ValueError:
-        return False
-    return True
-
-
-def get_results(client, execution_id):
-    results_paginator = client.get_paginator("get_query_results")
-    results_iter = results_paginator.paginate(QueryExecutionId=execution_id, PaginationConfig={"PageSize": 1000})
-    res = {}
-    for results_page in results_iter:
-        for row in results_page["ResultSet"]["Rows"][1:]:
-            # Loop through the JSON objects
-            key = row["Data"][0]["VarCharValue"]
-            if valid(key):
-                res[key] = row["Data"][1]["VarCharValue"]
-
-    return res
-
-
-def convert_data(data):
-    result = []
-    for key, value in data.items():
-        # 0.18.0_macOS_64bit.tar.gz
-        split_key = key.split("_")
-        if len(split_key) != 3:
-            continue
-        (version, os_version, arch) = split_key
-        arch_split = arch.split(".")
-        if len(arch_split) < 1:
-            continue
-        arch = arch_split[0]
-        if len(arch) > 10:
-            # This can't be an architecture really.
-            # It's an ugly solution but works for now so deal with it.
-            continue
-        repo = os.environ["GITHUB_REPOSITORY"].split("/")[1]
-        result.append(
-            {
-                "type": "gauge",
-                "name": "arduino.downloads.total",
-                "value": value,
-                "host": os.environ["GITHUB_REPOSITORY"],
-                "tags": [
-                    f"version:{version}",
-                    f"os:{os_version}",
-                    f"arch:{arch}",
-                    "cdn:downloads.arduino.cc",
-                    f"project:{repo}",
-                ],
-            }
-        )
-
-    return result
-
-
-if __name__ == "__main__":
-    DEST_S3_OUTPUT = os.environ["AWS_ATHENA_OUTPUT_LOCATION"]
-    AWS_ATHENA_SOURCE_TABLE = os.environ["AWS_ATHENA_SOURCE_TABLE"]
-
-    session = boto3.session.Session(region_name="us-east-1")
-    athena_client = session.client("athena")
-
-    # Load all partitions before querying downloads
-    execute(athena_client, f"MSCK REPAIR TABLE {AWS_ATHENA_SOURCE_TABLE};", DEST_S3_OUTPUT)
-
-    query = f"""SELECT replace(json_extract_scalar(url_decode(url_decode(querystring)),
-'$.data.url'), 'https://downloads.arduino.cc/arduino-ide/arduino-ide_', '')
-AS flavor, count(json_extract(url_decode(url_decode(querystring)),'$')) AS gauge
-FROM {AWS_ATHENA_SOURCE_TABLE}
-WHERE json_extract_scalar(url_decode(url_decode(querystring)),'$.data.url')
-LIKE 'https://downloads.arduino.cc/arduino-ide/arduino-ide_%'
-AND json_extract_scalar(url_decode(url_decode(querystring)),'$.data.url')
-NOT LIKE '%latest%' -- exclude latest redirect
-group by 1 ;"""
-    exec_id = execute(athena_client, query, DEST_S3_OUTPUT)
-    results = get_results(athena_client, exec_id)
-    result_json = convert_data(results)
-
-    print(f"::set-output name=result::{result_json}")

.github/workflows/arduino-stats.yaml

@@ -1,57 +0,0 @@
-name: arduino-stats
-
-on:
-  schedule:
-    # run every day at 07:00 AM, 03:00 PM and 11:00 PM
-    - cron: "0 7,15,23 * * *"
-  workflow_dispatch:
-  repository_dispatch:
-
-jobs:
-  push-stats:
-    # This workflow is only of value to the arduino/arduino-ide repository and
-    # would always fail in forks
-    if: github.repository == 'arduino/arduino-ide'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - uses: actions/setup-python@v2
-        with:
-          python-version: '3.x'
-
-      - name: Fetch downloads count form Arduino CDN using AWS Athena
-        id: fetch
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.STATS_AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.STATS_AWS_SECRET_ACCESS_KEY }}
-          AWS_ATHENA_SOURCE_TABLE: ${{ secrets.STATS_AWS_ATHENA_SOURCE_TABLE }}
-          AWS_ATHENA_OUTPUT_LOCATION: ${{ secrets.STATS_AWS_ATHENA_OUTPUT_LOCATION }}
-          GITHUB_REPOSITORY: ${{ github.repository }}
-        run: |
-          pip install boto3 semver
-          python .github/tools/fetch_athena_stats.py
-
-      - name: Send metrics
-        uses: masci/datadog@v1
-        with:
-          api-key: ${{ secrets.DD_API_KEY }}
-          # Metrics input expects YAML but JSON will work just right.
-          metrics: ${{steps.fetch.outputs.result}}
-
-      - name: Report failure
-        if: failure()
-        uses: masci/datadog@v1
-        with:
-          api-key: ${{ secrets.DD_API_KEY }}
-          events: |
-            - title: "Arduino IDE stats failing"
-              text: "Stats collection failed"
-              alert_type: "error"
-              host: ${{ github.repository }}
-              tags:
-                - "project:arduino-ide"
-                - "cdn:downloads.arduino.cc"
-                - "workflow:${{ github.workflow }}"

.github/workflows/assets/linux.Dockerfile

@@ -0,0 +1,63 @@
+# The Arduino IDE Linux build workflow job runs in this container.
+# syntax=docker/dockerfile:1
+
+# See: https://hub.docker.com/_/ubuntu/tags
+FROM ubuntu:18.10
+
+# This is required in order to use the Ubuntu package repositories for EOL Ubuntu versions:
+# https://help.ubuntu.com/community/EOLUpgrades#Update_sources.list
+RUN \
+  sed \
+    --in-place \
+    --regexp-extended \
+    --expression='s/([a-z]{2}\.)?archive.ubuntu.com|security.ubuntu.com/old-releases.ubuntu.com/g' \
+    "/etc/apt/sources.list"
+
+RUN \
+  apt-get \
+    --yes \
+    update
+
+RUN \
+  apt-get \
+    --yes \
+    install \
+      "git"
+
+# 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
+# container.
+RUN \
+  apt-get \
+    --yes \
+    install \
+      "python3.7-minimal=3.7.3-2~18.10"
+
+# 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-3" \
+      "libx11-dev=2:1.6.7-1" \
+      "libxkbfile-dev=1:1.0.9-2"
+
+# Target python3 symlink to Python 3.7 installation. It would otherwise target version 3.6 due to the installation of
+# the `python3` package as a transitive dependency.
+RUN \
+  ln \
+    --symbolic \
+    --force \
+    "$(which python3.7)" \
+    "/usr/bin/python3"

.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,137 +30,517 @@ 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:
-  JOB_TRANSFER_ARTIFACT: build-artifacts
+  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
+  GO_VERSION: '1.21'
+  # See: https://github.com/actions/setup-node/#readme
+  NODE_VERSION: '18.17'
+  YARN_VERSION: '1.22'
+  JOB_TRANSFER_ARTIFACT_PREFIX: build-artifacts-
   CHANGELOG_ARTIFACTS: changelog
+  STAGED_CHANNEL_FILE_ARTIFACT_PREFIX: staged-channel-file-
+  BASE_BUILD_DATA: |
+    - config:
+        # Human identifier for the job.
+        name: Windows
+        runs-on: [self-hosted, windows-sign-pc]
+        # 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: INSTALLER_CERT_WINDOWS_CER
+        # Name of the secret that contains the certificate password.
+        certificate-password-secret: INSTALLER_CERT_WINDOWS_PASSWORD
+        # File extension for the certificate.
+        certificate-extension: pfx
+        # Container for windows cert signing
+        certificate-container: INSTALLER_CERT_WINDOWS_CONTAINER
+        # Arbitrary identifier used to give the workflow artifact uploaded by each "build" matrix job a unique name.
+        job-transfer-artifact-suffix: Windows_64bit
+        # 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'
+        # as this runs on a self hosted runner, we need to avoid building with the default working directory path,
+        # otherwise paths in the build job will be too long for `light.exe`
+        # we use the below as a Symbolic link (just changing the wd will break the checkout action)
+        # this is a work around (see: https://github.com/actions/checkout/issues/197).
+        working-directory: 'C:\a'
+      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\"
+          }
+        job-transfer-artifact-suffix: Linux_64bit
+        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-13
+        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
+        job-transfer-artifact-suffix: macOS_64bit
+        mergeable-channel-file: 'true'
+      artifacts:
+        - path: '*macOS_64bit.dmg'
+          name: macOS_X86-64_dmg
+        - path: '*macOS_64bit.zip'
+          name: macOS_X86-64_zip
+    - config:
+        name: macOS ARM
+        runs-on: macos-latest
+        container: |
+          null
+        certificate-secret: APPLE_SIGNING_CERTIFICATE_P12
+        certificate-password-secret: KEYCHAIN_PASSWORD
+        certificate-extension: p12
+        job-transfer-artifact-suffix: macOS_arm64
+        mergeable-channel-file: 'true'
+      artifacts:
+        - path: '*macOS_arm64.dmg'
+          name: macOS_arm64_dmg
+        - path: '*macOS_arm64.zip'
+          name: macOS_arm64_zip
+  PAID_RUNNER_BUILD_DATA: |
+    # This system was implemented to allow selective use of paid GitHub-hosted runners, due to the Apple Silicon runner
+    # incurring a charge at that time. Free Apple Silicon runners are now available so the configuration was moved to
+    # `BASE_BUILD_DATA`, but the system was left in place for future use.
 
 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 }}
+    environment: production
+    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_ROLE_ARN != '' }}" >> $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 \
+                'map(.artifacts[] + (.config | pick(["job-transfer-artifact-suffix"])))'
+            )"
+
+            # 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 \
+                'map(.artifacts[] + (.config | pick(["job-transfer-artifact-suffix"])))'
+            )"
+
+            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.os }})
+    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
+      # to skip passing signing credentials to electron-builder
+      IS_WINDOWS_CONFIG: ${{ matrix.config.name == 'Windows' }}
+      INSTALLER_CERT_WINDOWS_CER: "/tmp/cert.cer"
+      # We are hardcoding the path for signtool because is not present on the windows PATH env var by default.
+      # Keep in mind that this path could change when upgrading to a new runner version
+      SIGNTOOL_PATH: "C:/Program Files (x86)/Windows Kits/10/bin/10.0.19041.0/x86/signtool.exe"
+      WIN_CERT_PASSWORD: ${{ secrets[matrix.config.certificate-password-secret] }}
+      WIN_CERT_CONTAINER_NAME: ${{ secrets[matrix.config.certificate-container] }}
+      PUPPETEER_SKIP_DOWNLOAD: true
+
     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
-            # 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 }}
+        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
-        uses: actions/checkout@v2
+      - name: Symlink custom working directory
+        shell: cmd
+        if: runner.os == 'Windows' && matrix.config.working-directory
+        run: |
+          if not exist "${{ matrix.config.working-directory }}" mklink /d "${{ matrix.config.working-directory }}" "C:\actions-runner\_work\arduino-ide\arduino-ide"
 
-      - name: Install Node.js 14.x
-        uses: actions/setup-node@v1
+      - name: Checkout
+        uses: actions/checkout@v4
+
+
+      - name: Install Node.js
+        if: runner.name != 'WINDOWS-SIGN-PC'
+        uses: actions/setup-node@v4
         with:
-          node-version: '14.x'
+          node-version: ${{ env.NODE_VERSION }}
           registry-url: 'https://registry.npmjs.org'
+          # Yarn is a prerequisite for the action's cache feature, so caching should be disabled when running in the
+          # container where Yarn is not pre-installed.
+          cache: ${{ fromJSON(matrix.config.container) == null && 'yarn' || null }}
+
+      - name: Install Yarn
+        if: runner.name != 'WINDOWS-SIGN-PC'
+        run: |
+          npm \
+            install \
+              --global \
+              "yarn@${{ env.YARN_VERSION }}"
 
       - name: Install Python 3.x
-        uses: actions/setup-python@v2
+        if: fromJSON(matrix.config.container) == null && runner.name != 'WINDOWS-SIGN-PC'
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.x'
+          python-version: '3.11.x'
+
+      - name: Install Go
+        if: runner.name != 'WINDOWS-SIGN-PC'
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Install Taskfile
+        if: runner.name != 'WINDOWS-SIGN-PC'
+        uses: arduino/setup-task@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          version: 3.x
 
       - name: Package
-        shell: bash
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           AC_USERNAME: ${{ secrets.AC_USERNAME }}
           AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
           AC_TEAM_ID: ${{ secrets.AC_TEAM_ID }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          IS_NIGHTLY: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/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] != '' }}
+        working-directory: ${{ matrix.config.working-directory || './' }}
         run: |
           # See: https://www.electron.build/code-signing
-          if [ $CAN_SIGN = false ]; then
+          if [ $CAN_SIGN = false ] || [ $IS_WINDOWS_CONFIG = true ]; then
             echo "Skipping the app signing: certificate not provided."
           else
             export CSC_LINK="${{ runner.temp }}/signing_certificate.${{ matrix.config.certificate-extension }}"
             echo "${{ secrets[matrix.config.certificate-secret] }}" | base64 --decode > "$CSC_LINK"
             export CSC_KEY_PASSWORD="${{ secrets[matrix.config.certificate-password-secret] }}"
+            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
 
-      - name: Upload [GitHub Actions]
-        uses: actions/upload-artifact@v2
+          yarn --cwd arduino-ide-extension build
+          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'
+        working-directory: ${{ matrix.config.working-directory || './' }}
+        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@v4
+        if: >
+          needs.select-targets.outputs.merge-channel-files == 'true' &&
+          matrix.config.mergeable-channel-file == 'true'
         with:
-          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
-          path: electron/build/dist/build-artifacts/
+          if-no-files-found: error
+          name: ${{ env.STAGED_CHANNEL_FILE_ARTIFACT_PREFIX }}${{ matrix.config.job-transfer-artifact-suffix }}
+          path: ${{ matrix.config.working-directory && format('{0}/{1}', matrix.config.working-directory, env.STAGED_CHANNEL_FILES_PATH) || env.STAGED_CHANNEL_FILES_PATH }}
+
+      - name: Upload builds to job transfer artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.JOB_TRANSFER_ARTIFACT_PREFIX }}${{ matrix.config.job-transfer-artifact-suffix }}
+          path: ${{ matrix.config.working-directory && format('{0}/{1}', matrix.config.working-directory, env.BUILD_ARTIFACTS_PATH) || env.BUILD_ARTIFACTS_PATH }}
+
+      - name: Manual Clean up for self-hosted runners
+        if: runner.os == 'Windows' && matrix.config.working-directory
+        shell: cmd
+        run: |
+          rmdir /s /q "${{ matrix.config.working-directory }}\${{ 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 file artifacts
+        uses: actions/download-artifact@v4
+        with:
+          merge-multiple: true
+          path: ${{ env.CHANNEL_FILES_PATH }}
+          pattern: ${{ env.STAGED_CHANNEL_FILE_ARTIFACT_PREFIX }}*
+
+      - name: Remove no longer needed artifacts
+        uses: geekyeggo/delete-artifact@v5
+        with:
+          name: ${{ env.STAGED_CHANNEL_FILE_ARTIFACT_PREFIX }}*
+
+      - 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@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          version: 3.x
+
+      - name: Install dependencies (Linux only)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libx11-dev libxkbfile-dev libsecret-1-dev
+
+      - 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 job transfer artifact
+        uses: actions/upload-artifact@v4
+        with:
+          if-no-files-found: error
+          name: ${{ env.JOB_TRANSFER_ARTIFACT_PREFIX }}channel-files
+          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
 
+    env:
+      BUILD_ARTIFACTS_FOLDER: build-artifacts
+
     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
-        uses: actions/download-artifact@v2
+      - name: Download job transfer artifact that contains ${{ matrix.artifact.name }} tester build
+        uses: actions/download-artifact@v4
         with:
-          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
-          path: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          name: ${{ env.JOB_TRANSFER_ARTIFACT_PREFIX }}${{ matrix.artifact.job-transfer-artifact-suffix }}
+          path: ${{ env.BUILD_ARTIFACTS_FOLDER }}
 
       - name: Upload tester build artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.artifact.name }}
-          path: ${{ env.JOB_TRANSFER_ARTIFACT }}/${{ matrix.artifact.path }}
+          path: ${{ env.BUILD_ARTIFACTS_FOLDER }}/${{ 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@v2
+        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')
@@ -167,81 +555,132 @@ jobs:
             fi
           fi
           echo -e "$BODY"
-          OUTPUT_SAFE_BODY="${BODY//'%'/'%25'}"
-          OUTPUT_SAFE_BODY="${OUTPUT_SAFE_BODY//$'\n'/'%0A'}"
-          OUTPUT_SAFE_BODY="${OUTPUT_SAFE_BODY//$'\r'/'%0D'}"
-          echo "::set-output name=BODY::$OUTPUT_SAFE_BODY"
+
+          # Set workflow step output
+          # See: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
+          DELIMITER="$RANDOM"
+          echo "BODY<<$DELIMITER" >> $GITHUB_OUTPUT
+          echo "$BODY" >> $GITHUB_OUTPUT
+          echo "$DELIMITER" >> $GITHUB_OUTPUT
+
           echo "$BODY" > CHANGELOG.txt
 
-      - name: Upload Changelog [GitHub Actions]
-        if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main')
-        uses: actions/upload-artifact@v2
+      - name: Upload changelog job transfer artifact
+        if: needs.build-type-determination.outputs.is-nightly == 'true'
+        uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          name: ${{ env.JOB_TRANSFER_ARTIFACT_PREFIX }}changelog
           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
+
+    env:
+      ARTIFACTS_FOLDER: build-artifacts
+
+    environment: production
+
+    permissions:
+      id-token: write
+      contents: read
+
     steps:
-      - name: Download [GitHub Actions]
-        uses: actions/download-artifact@v2
+      - name: Download all job transfer artifacts
+        uses: actions/download-artifact@v4
         with:
-          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
-          path: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          merge-multiple: true
+          path: ${{ env.ARTIFACTS_FOLDER }}
+          pattern: ${{ env.JOB_TRANSFER_ARTIFACT_PREFIX }}*
+
+      - name: Configure AWS Credentials for Nightly [S3]
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
+          aws-region: us-east-1
 
       - name: Publish Nightly [S3]
-        uses: docker://plugins/s3
-        env:
-          PLUGIN_SOURCE: '${{ env.JOB_TRANSFER_ARTIFACT }}/*'
-          PLUGIN_STRIP_PREFIX: '${{ env.JOB_TRANSFER_ARTIFACT }}/'
-          PLUGIN_TARGET: '/arduino-ide/nightly'
-          PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        run: |
+          aws s3 sync ${{ env.ARTIFACTS_FOLDER }} s3://${{ secrets.DOWNLOADS_BUCKET }}/arduino-ide/nightly
 
   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
+
+    env:
+      ARTIFACTS_FOLDER: build-artifacts
+
+    environment: production
+
+    permissions:
+      id-token: write
+      contents: write
+
     steps:
-      - name: Download [GitHub Actions]
-        uses: actions/download-artifact@v2
+      - name: Download all job transfer artifacts
+        uses: actions/download-artifact@v4
         with:
-          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
-          path: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          merge-multiple: true
+          path: ${{ env.ARTIFACTS_FOLDER }}
+          pattern: ${{ env.JOB_TRANSFER_ARTIFACT_PREFIX }}*
 
       - name: Get Tag
         id: tag_name
         run: |
-          echo ::set-output name=TAG_NAME::${GITHUB_REF#refs/tags/}
+          echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
       - name: Publish Release [GitHub]
-        uses: svenstaro/upload-release-action@2.2.0
+        uses: svenstaro/upload-release-action@2.9.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           release_name: ${{ steps.tag_name.outputs.TAG_NAME }}
-          file: ${{ env.JOB_TRANSFER_ARTIFACT }}/*
+          file: ${{ env.ARTIFACTS_FOLDER }}/*
           tag: ${{ github.ref }}
           file_glob: true
           body: ${{ needs.changelog.outputs.BODY }}
 
+      - name: Configure AWS Credentials for Release [S3]
+        if: needs.build-type-determination.outputs.publish-to-s3 == 'true'
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_ARN }}
+          aws-region: us-east-1
+
       - name: Publish Release [S3]
-        if: github.repository == 'arduino/arduino-ide'
-        uses: docker://plugins/s3
-        env:
-          PLUGIN_SOURCE: '${{ env.JOB_TRANSFER_ARTIFACT }}/*'
-          PLUGIN_STRIP_PREFIX: '${{ env.JOB_TRANSFER_ARTIFACT }}/'
-          PLUGIN_TARGET: '/arduino-ide'
-          PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        if: needs.build-type-determination.outputs.publish-to-s3 == 'true'
+        run: |
+          aws s3 sync ${{ env.ARTIFACTS_FOLDER }} s3://${{ secrets.DOWNLOADS_BUCKET }}/arduino-ide
 
   clean:
     # This job must run after all jobs that use the transfer artifact.
     needs:
       - build
+      - merge-channel-files
       - publish
       - release
       - artifacts
@@ -249,7 +688,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Remove unneeded job transfer artifact
-        uses: geekyeggo/delete-artifact@v1
+      - name: Remove unneeded job transfer artifacts
+        uses: geekyeggo/delete-artifact@v5
         with:
-          name: ${{ env.JOB_TRANSFER_ARTIFACT }}
+          name: ${{ env.JOB_TRANSFER_ARTIFACT_PREFIX }}*

.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
@@ -36,9 +74,11 @@ jobs:
           - identifier: macOS signing certificate # Text used to identify certificate in notifications.
             certificate-secret: APPLE_SIGNING_CERTIFICATE_P12 # Name of the secret that contains the certificate.
             password-secret: KEYCHAIN_PASSWORD # Name of the secret that contains the certificate password.
+            type: pkcs12
           - identifier: Windows signing certificate
-            certificate-secret: WINDOWS_SIGNING_CERTIFICATE_PFX
-            password-secret: WINDOWS_SIGNING_CERTIFICATE_PASSWORD
+            certificate-secret: INSTALLER_CERT_WINDOWS_CER
+            # The password for the Windows certificate is not needed, because its not a container, but a single certificate.
+            type: x509
 
     steps:
       - name: Set certificate path environment variable
@@ -57,9 +97,11 @@ jobs:
           CERTIFICATE_PASSWORD: ${{ secrets[matrix.certificate.password-secret] }}
         run: |
           (
-            openssl pkcs12 \
+            openssl ${{ matrix.certificate.type }} \
               -in "${{ env.CERTIFICATE_PATH }}" \
-              -noout -passin env:CERTIFICATE_PASSWORD
+              -legacy \
+              -noout \
+              -passin env:CERTIFICATE_PASSWORD
           ) || (
             echo "::error::Verification of ${{ matrix.certificate.identifier }} failed!!!"
             exit 1
@@ -82,25 +124,43 @@ jobs:
           CERTIFICATE_PASSWORD: ${{ secrets[matrix.certificate.password-secret] }}
         id: get-days-before-expiration
         run: |
-          EXPIRATION_DATE="$(
-            (
-              openssl pkcs12 \
-                -in "${{ env.CERTIFICATE_PATH }}" \
-                -clcerts \
-                -nodes \
-                -passin env:CERTIFICATE_PASSWORD
-            ) | (
-              openssl x509 \
-                -noout \
-                -enddate
-            ) | (
-              grep \
-                --max-count=1 \
-                --only-matching \
-                --perl-regexp \
-                'notAfter=(\K.*)'
-            )
-          )"
+          if [[ ${{ matrix.certificate.type }} == "pkcs12" ]]; then
+            EXPIRATION_DATE="$(
+              (
+                openssl pkcs12 \
+                  -in "${{ env.CERTIFICATE_PATH }}" \
+                  -clcerts \
+                  -legacy \
+                  -nodes \
+                  -passin env:CERTIFICATE_PASSWORD
+              ) | (
+                openssl x509 \
+                  -noout \
+                  -enddate
+              ) | (
+                grep \
+                  --max-count=1 \
+                  --only-matching \
+                  --perl-regexp \
+                  'notAfter=(\K.*)'
+              )
+            )"
+          elif [[ ${{ matrix.certificate.type }} == "x509" ]]; then
+            EXPIRATION_DATE="$(
+                (
+                openssl x509 \
+                    -in ${{ env.CERTIFICATE_PATH }} \
+                    -noout \
+                    -enddate
+                ) | (
+                grep \
+                    --max-count=1 \
+                    --only-matching \
+                    --perl-regexp \
+                    'notAfter=(\K.*)'
+                )
+            )"
+          fi
 
           DAYS_BEFORE_EXPIRATION="$((($(date --utc --date="$EXPIRATION_DATE" +%s) - $(date --utc +%s)) / 60 / 60 / 24))"
 
@@ -108,7 +168,7 @@ jobs:
           echo "Certificate expiration date: $EXPIRATION_DATE"
           echo "Days remaining before expiration: $DAYS_BEFORE_EXPIRATION"
 
-          echo "::set-output name=days::$DAYS_BEFORE_EXPIRATION"
+          echo "days=$DAYS_BEFORE_EXPIRATION" >> $GITHUB_OUTPUT
 
       - name: Check if expiration notification period has been reached
         id: check-expiration

.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@v6
+        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

@@ -1,7 +1,12 @@
 name: Check Internationalization
 
+env:
+  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
+  GO_VERSION: '1.21'
+
 # See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
 on:
+  create:
   push:
     paths:
       - '.github/workflows/check-i18n-task.ya?ml'
@@ -18,21 +23,69 @@ 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@v2
+        uses: actions/checkout@v4
 
-      - name: Install Node.js 14.x
-        uses: actions/setup-node@v2
+      - name: Install Node.js 18.17
+        uses: actions/setup-node@v4
         with:
-          node-version: '14.x'
+          node-version: '18.17'
           registry-url: 'https://registry.npmjs.org'
+          cache: 'yarn'
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Install Taskfile
+        uses: arduino/setup-task@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          version: 3.x
+
+      - name: Install dependencies (Linux only)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libx11-dev libxkbfile-dev libsecret-1-dev
 
       - name: Install dependencies
-        run: yarn
+        run: yarn install --immutable
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Check for errors
         run: yarn i18n:check

.github/workflows/check-javascript.yml

@@ -0,0 +1,94 @@
+# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/check-javascript-task.md
+name: Check JavaScript
+
+env:
+  # See: https://github.com/actions/setup-node/#readme
+  NODE_VERSION: 18.17
+
+# See: https://docs.github.com/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows
+on:
+  create:
+  push:
+    paths:
+      - '.github/workflows/check-javascript.ya?ml'
+      - '**/.eslintignore'
+      - '**/.eslintrc*'
+      - '**/.npmrc'
+      - '**/package.json'
+      - '**/package-lock.json'
+      - '**/yarn.lock'
+      - '**.jsx?'
+  pull_request:
+    paths:
+      - '.github/workflows/check-javascript.ya?ml'
+      - '**/.eslintignore'
+      - '**/.eslintrc*'
+      - '**/.npmrc'
+      - '**/package.json'
+      - '**/package-lock.json'
+      - '**/yarn.lock'
+      - '**.jsx?'
+  workflow_dispatch:
+  repository_dispatch:
+
+jobs:
+  run-determination:
+    runs-on: ubuntu-latest
+    permissions: {}
+    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"
+          # 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
+
+  check:
+    needs: run-determination
+    if: needs.run-determination.outputs.result == 'true'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          cache: yarn
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: Install Dependencies (Linux only)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libx11-dev libxkbfile-dev libsecret-1-dev
+
+      - name: Install npm package dependencies
+        env:
+          # Avoid failure of @vscode/ripgrep installation due to GitHub API rate limiting:
+          # https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          yarn install
+
+      - name: Lint
+        run: |
+          yarn \
+            --cwd arduino-ide-extension \
+            lint

.github/workflows/check-yarn.yml

@@ -0,0 +1,97 @@
+name: Check Yarn
+
+# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
+on:
+  create:
+  push:
+    paths:
+      - ".github/workflows/check-yarn.ya?ml"
+      - "**/.yarnrc"
+      - "**/package.json"
+      - "**/package-lock.json"
+      - "**/yarn.lock"
+  pull_request:
+    paths:
+      - ".github/workflows/check-yarn.ya?ml"
+      - "**/.yarnrc"
+      - "**/package.json"
+      - "**/package-lock.json"
+      - "**/yarn.lock"
+  schedule:
+    # Run every Tuesday at 8 AM UTC to catch breakage resulting from changes to the JSON schema.
+    - cron: "0 8 * * TUE"
+  workflow_dispatch:
+  repository_dispatch:
+
+jobs:
+  run-determination:
+    runs-on: ubuntu-latest
+    permissions: {}
+    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"
+          # 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
+
+  check-sync:
+    name: check-sync (${{ matrix.project.path }})
+    needs: run-determination
+    if: needs.run-determination.outputs.result == 'true'
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        project:
+          - path: .
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          cache: yarn
+          node-version: ${{ env.NODE_VERSION }}
+
+      - name: Install Dependencies (Linux only)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libx11-dev libxkbfile-dev libsecret-1-dev
+
+      - name: Install npm package dependencies
+        env:
+          # Avoid failure of @vscode/ripgrep installation due to GitHub API rate limiting:
+          # https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          yarn \
+            install \
+            --ignore-scripts
+
+      - name: Check yarn.lock
+        run: |
+          git \
+            diff \
+              --color \
+              --exit-code \
+              "${{ matrix.project.path }}/yarn.lock"

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

@@ -8,31 +8,42 @@ on:
 env:
   CHANGELOG_ARTIFACTS: changelog
   # See: https://github.com/actions/setup-node/#readme
-  NODE_VERSION: 14.x
+  NODE_VERSION: '18.17'
 
 jobs:
   create-changelog:
     if: github.repository == 'arduino/arduino-ide'
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    environment: production
+      
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        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'
 
+      - name: Install Dependencies (Linux only)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libx11-dev libxkbfile-dev libsecret-1-dev
+
       - name: Get Tag
         id: tag_name
         run: |
-          echo ::set-output name=TAG_NAME::${GITHUB_REF#refs/tags/}
+          echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
 
       - name: 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
@@ -44,12 +55,12 @@ jobs:
           # Compose changelog
           yarn run compose-changelog "${{ github.workspace }}/${{ env.CHANGELOG_ARTIFACTS }}/$CHANGELOG_FILE_NAME"
 
+      - name: Configure AWS Credentials for Changelog [S3]
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-to-assume: ${{ secrets.AWS_ROLE_ARN }} 
+          aws-region: us-east-1 
+
       - name: Publish Changelog [S3]
-        uses: docker://plugins/s3
-        env:
-          PLUGIN_SOURCE: '${{ env.CHANGELOG_ARTIFACTS }}/*'
-          PLUGIN_STRIP_PREFIX: '${{ env.CHANGELOG_ARTIFACTS }}/'
-          PLUGIN_TARGET: '/arduino-ide/changelog'
-          PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        run: |
+          aws s3 sync ${{ env.CHANGELOG_ARTIFACTS }} s3://${{ secrets.DOWNLOADS_BUCKET }}/arduino-ide/changelog

.github/workflows/github-stats.yaml

@@ -1,96 +0,0 @@
-name: github-stats
-
-on:
-  schedule:
-    # run every 30 minutes
-    - cron: "*/30 * * * *"
-  workflow_dispatch:
-  repository_dispatch:
-
-jobs:
-  push-stats:
-    # This workflow is only of value to the arduino/arduino-ide repository and
-    # would always fail in forks
-    if: github.repository == 'arduino/arduino-ide'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Fetch downloads count
-        id: fetch
-        uses: actions/github-script@v4
-        with:
-          github-token: ${{github.token}}
-          script: |
-            let metrics = []
-
-            // Get a list of releases
-            const opts = github.repos.listReleases.endpoint.merge({
-              ...context.repo
-            })
-            const releases = await github.paginate(opts)
-
-            // Get download stats for every release
-            for (const rel of releases) {
-              // Names for assets are like `arduino-ide_2.0.0-beta.12_Linux_64bit.zip`,
-              // we'll use this later to split the asset file name more easily
-              const baseName = `arduino-ide_${rel.name}_`
-
-              // Get a list of assets for this release
-              const opts = github.repos.listReleaseAssets.endpoint.merge({
-                ...context.repo,
-                release_id: rel.id
-              })
-              const assets = await github.paginate(opts)
-
-              for (const asset of assets) {
-                // Ignore files that are not arduino-ide packages
-                if (!asset.name.startsWith(baseName)) {
-                  continue
-                }
-
-                // Strip the base and remove file extension to get `Linux_32bit`
-                systemArch = asset.name.replace(baseName, "").split(".")[0].split("_")
-
-                // Add a metric object to the list of gathered metrics
-                metrics.push({
-                  "type": "gauge",
-                  "name": "arduino.downloads.total",
-                  "value": asset.download_count,
-                  "host": "${{ github.repository }}",
-                  "tags": [
-                    `version:${rel.name}`,
-                    `os:${systemArch[0]}`,
-                    `arch:${systemArch[1]}`,
-                    "cdn:github.com",
-                    "project:arduino-ide"
-                  ]
-                })
-              }
-            }
-
-            // The action will put whatever we return from this function in
-            // `outputs.result`, JSON encoded. So we just return the array
-            // of objects and GitHub will do the rest.
-            return metrics
-
-      - name: Send metrics
-        uses: masci/datadog@v1
-        with:
-          api-key: ${{ secrets.DD_API_KEY }}
-          # Metrics input expects YAML but JSON will work just right.
-          metrics: ${{steps.fetch.outputs.result}}
-
-      - name: Report failure
-        if: failure()
-        uses: masci/datadog@v1
-        with:
-          api-key: ${{ secrets.DD_API_KEY }}
-          events: |
-            - title: "Arduino IDE stats failing"
-              text: "Stats collection failed"
-              alert_type: "error"
-              host: ${{ github.repository }}
-              tags:
-                - "project:arduino-ide"
-                - "cdn:github.com"
-                - "workflow:${{ github.workflow }}"

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

@@ -1,5 +1,9 @@
 name: i18n-nightly-push
 
+env:
+  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
+  GO_VERSION: '1.21'
+
 on:
   schedule:
     # run every day at 1AM
@@ -10,16 +14,34 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: Install Node.js 14.x
-        uses: actions/setup-node@v2
+      - name: Install Node.js 18.17
+        uses: actions/setup-node@v4
         with:
-          node-version: '14.x'
+          node-version: '18.17'
           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@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          version: 3.x
+
+      - name: Install dependencies (Linux only)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libx11-dev libxkbfile-dev libsecret-1-dev
 
       - 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

@@ -1,5 +1,9 @@
 name: i18n-weekly-pull
 
+env:
+  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
+  GO_VERSION: '1.21'
+
 on:
   schedule:
     # run every monday at 2AM
@@ -10,16 +14,34 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: Install Node.js 14.x
-        uses: actions/setup-node@v2
+      - name: Install Node.js 18.17
+        uses: actions/setup-node@v4
         with:
-          node-version: '14.x'
+          node-version: '18.17'
           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@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          version: 3.x
+
+      - name: Install dependencies (Linux only)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libx11-dev libxkbfile-dev libsecret-1-dev
 
       - name: Install dependencies
-        run: yarn
+        run: yarn install --immutable
 
       - name: Run i18n:pull script
         run: yarn run i18n:pull
@@ -30,7 +52,7 @@ jobs:
           TRANSIFEX_API_KEY: ${{ secrets.TRANSIFEX_API_KEY }}
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v7
         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@v6
+        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,21 +5,21 @@ 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:
 
 env:
   CONFIGURATIONS_FOLDER: .github/label-configuration-files
-  CONFIGURATIONS_ARTIFACT: label-configuration-files
+  CONFIGURATIONS_ARTIFACT_PREFIX: label-configuration-file-
 
 jobs:
   check:
@@ -27,11 +27,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Download JSON schema for labels configuration file
         id: download-schema
-        uses: carlosperate/download-file-action@v1
+        uses: carlosperate/download-file-action@v2
         with:
           file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/arduino-tooling-gh-label-configuration-schema.json
           location: ${{ runner.temp }}/label-configuration-schema
@@ -66,18 +66,18 @@ jobs:
 
     steps:
       - name: Download
-        uses: carlosperate/download-file-action@v1
+        uses: carlosperate/download-file-action@v2
         with:
           file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}
 
       - name: Pass configuration files to next job via workflow artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           path: |
             *.yaml
             *.yml
           if-no-files-found: error
-          name: ${{ env.CONFIGURATIONS_ARTIFACT }}
+          name: ${{ env.CONFIGURATIONS_ARTIFACT_PREFIX }}${{ matrix.filename }}
 
   sync:
     needs: download
@@ -103,21 +103,22 @@ jobs:
         run: |
           # Use of this flag in the github-label-sync command will cause it to only check the validity of the
           # configuration.
-          echo "::set-output name=flag::--dry-run"
+          echo "flag=--dry-run" >> $GITHUB_OUTPUT
 
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: Download configuration files artifact
-        uses: actions/download-artifact@v2
+      - name: Download configuration file artifacts
+        uses: actions/download-artifact@v4
         with:
-          name: ${{ env.CONFIGURATIONS_ARTIFACT }}
+          merge-multiple: true
+          pattern: ${{ env.CONFIGURATIONS_ARTIFACT_PREFIX }}*
           path: ${{ env.CONFIGURATIONS_FOLDER }}
 
-      - name: Remove unneeded artifact
-        uses: geekyeggo/delete-artifact@v1
+      - name: Remove unneeded artifacts
+        uses: geekyeggo/delete-artifact@v5
         with:
-          name: ${{ env.CONFIGURATIONS_ARTIFACT }}
+          name: ${{ env.CONFIGURATIONS_ARTIFACT_PREFIX }}*
 
       - name: Merge label configuration files
         run: |

.github/workflows/test-javascript.yml

@@ -0,0 +1,140 @@
+name: Test JavaScript
+
+env:
+  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
+  GO_VERSION: '1.21'
+  # See: https://github.com/actions/setup-node/#readme
+  NODE_VERSION: 18.17
+
+on:
+  push:
+    paths:
+      - ".github/workflows/test-javascript.ya?ml"
+      - "**/.mocharc.js"
+      - "**/.mocharc.jsonc?"
+      - "**/.mocharc.ya?ml"
+      - "**/package.json"
+      - "**/package-lock.json"
+      - "**/yarn.lock"
+      - "tests/testdata/**"
+      - "**/tsconfig.json"
+      - "**.[jt]sx?"
+  pull_request:
+    paths:
+      - ".github/workflows/test-javascript.ya?ml"
+      - "**/.mocharc.js"
+      - "**/.mocharc.jsonc?"
+      - "**/.mocharc.ya?ml"
+      - "**/package.json"
+      - "**/package-lock.json"
+      - "**/yarn.lock"
+      - "tests/testdata/**"
+      - "**/tsconfig.json"
+      - "**.[jt]sx?"
+  workflow_dispatch:
+  repository_dispatch:
+
+jobs:
+  run-determination:
+    runs-on: ubuntu-latest
+    permissions: {}
+    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"
+          # 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
+
+  test:
+    name: test (${{ matrix.project.path }}, ${{ matrix.operating-system }})
+    needs: run-determination
+    if: needs.run-determination.outputs.result == 'true'
+    runs-on: ${{ matrix.operating-system }}
+    defaults:
+      run:
+        shell: bash
+    permissions:
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        project:
+          - path: .
+        operating-system:
+          - macos-latest
+          - ubuntu-latest
+          - windows-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          cache: yarn
+          node-version: ${{ env.NODE_VERSION }}
+
+      # See: https://github.com/eclipse-theia/theia/blob/master/doc/Developing.md#prerequisites
+      - name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11.x'
+
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Install Taskfile
+        uses: arduino/setup-task@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          version: 3.x
+
+      - name: Install Dependencies (Linux only)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libx11-dev libxkbfile-dev libsecret-1-dev
+
+      - name: Install npm package dependencies
+        env:
+          # Avoid failure of @vscode/ripgrep installation due to GitHub API rate limiting:
+          # https://github.com/microsoft/vscode-ripgrep#github-api-limit-note
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          yarn install
+
+      - name: Compile TypeScript
+        run: |
+          yarn \
+            --cwd arduino-ide-extension \
+            build
+
+      - name: Run tests
+        env:
+          # 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: |
+          yarn test
+          yarn \
+            --cwd arduino-ide-extension \
+            test:slow

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

@@ -7,23 +7,43 @@ on:
   workflow_dispatch:
 
 env:
-  NODE_VERSION: 14.x
+  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
+  GO_VERSION: '1.21'
+  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@v5
+        with:
+          go-version: ${{ env.GO_VERSION }}
+
+      - name: Install Task
+        uses: arduino/setup-task@v2
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          version: 3.x
+
+      - name: Install dependencies (Linux only)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libx11-dev libxkbfile-dev libsecret-1-dev
 
       - name: Install dependencies
-        run: yarn
+        run: yarn install --immutable
 
       - name: Run themes:pull script
         run: yarn run themes:pull
@@ -41,7 +61,7 @@ jobs:
         run: yarn run themes:generate
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v7
         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/
-Examples/
-!electron/build/
+arduino-ide-extension/src/node/resources
+arduino-ide-extension/Examples/
 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
-# the config files for the CLI
-arduino-ide-extension/data/cli/config
+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,36 +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",
-        "--no-cluster",
-        "--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",
-        "--nosplash",
-        "--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",
@@ -42,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",
-        "--no-cluster",
-        "--app-project-path=${workspaceRoot}/electron-app",
+        "--app-project-path=${workspaceFolder}/electron-app",
         "--remote-debugging-port=9222",
         "--no-app-auto-install",
-        "--plugins=local-dir:../plugins",
-        "--hosted-plugin-inspect=9339"
+        "--plugins=local-dir:./plugins",
+        "--hosted-plugin-inspect=9339",
+        "--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",
@@ -81,42 +80,11 @@
       "port": 9222,
       "webRoot": "${workspaceFolder}/electron-app"
     },
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "App (Browser)",
-      "program": "${workspaceRoot}/browser-app/src-gen/backend/main.js",
-      "args": [
-        "--hostname=0.0.0.0",
-        "--port=3000",
-        "--no-cluster",
-        "--no-app-auto-install",
-        "--plugins=local-dir:plugins"
-      ],
-      "windows": {
-        "env": {
-          "NODE_ENV": "development",
-          "NODE_PRESERVE_SYMLINKS": "1"
-        }
-      },
-      "env": {
-        "NODE_ENV": "development"
-      },
-      "sourceMaps": true,
-      "outFiles": [
-        "${workspaceRoot}/browser-app/src-gen/backend/*.js",
-        "${workspaceRoot}/browser-app/lib/**/*.js",
-        "${workspaceRoot}/arduino-ide-extension/lib/**/*.js"
-      ],
-      "smartStep": true,
-      "internalConsoleOptions": "openOnSessionStart",
-      "outputCapture": "std"
-    },
     {
       "type": "node",
       "request": "launch",
       "name": "Run Test [current]",
-      "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
+      "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
       "args": [
         "--require",
         "reflect-metadata/Reflect",
@@ -126,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,
@@ -139,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

@@ -2,8 +2,11 @@
   "files.exclude": {
     "**/lib": false
   },
+  "search.exclude": {
+    "arduino-ide-extension/src/test/node/__test_sketchbook__": true
+  },
   "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,18 +16,7 @@
       }
     },
     {
-      "label": "Arduino IDE - Start Browser App",
-      "type": "shell",
-      "command": "yarn --cwd ./browser-app start",
-      "group": "build",
-      "presentation": {
-        "reveal": "always",
-        "panel": "new",
-        "clear": true
-      }
-    },
-    {
-      "label": "Arduino IDE - Watch IDE Extension",
+      "label": "Watch Extension",
       "type": "shell",
       "command": "yarn --cwd ./arduino-ide-extension watch",
       "group": "build",
@@ -35,18 +27,7 @@
       }
     },
     {
-      "label": "Arduino IDE - Watch Browser App",
-      "type": "shell",
-      "command": "yarn --cwd ./browser-app watch",
-      "group": "build",
-      "presentation": {
-        "reveal": "always",
-        "panel": "new",
-        "clear": false
-      }
-    },
-    {
-      "label": "Arduino IDE - Watch Electron App",
+      "label": "Watch App",
       "type": "shell",
       "command": "yarn --cwd ./electron-app watch",
       "group": "build",
@@ -57,20 +38,9 @@
       }
     },
     {
-      "label": "Arduino IDE - Watch All [Browser]",
+      "label": "Watch All",
       "type": "shell",
-      "dependsOn": [
-        "Arduino IDE - Watch IDE Extension",
-        "Arduino IDE - Watch Browser App"
-      ]
-    },
-    {
-      "label": "Arduino IDE - Watch All [Electron]",
-      "type": "shell",
-      "dependsOn": [
-        "Arduino IDE - Watch IDE Extension",
-        "Arduino IDE - Watch Electron App"
-      ]
+      "dependsOn": ["Watch Extension", "Watch App"]
     }
   ]
 }

BUILDING.md

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

README.md

@@ -1,45 +1,20 @@
 <img src="https://content.arduino.cc/website/Arduino_logo_teal.svg" height="100" align="right" />
 
-# Arduino IDE 2.x (beta)
+# Arduino IDE 2.x
 
-[![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)
+[![Build status](https://github.com/arduino/arduino-ide/actions/workflows/build.yml/badge.svg)](https://github.com/arduino/arduino-ide/actions/workflows/build.yml)
+[![Check JavaScript status](https://github.com/arduino/arduino-ide/actions/workflows/check-javascript.yml/badge.svg)](https://github.com/arduino/arduino-ide/actions/workflows/check-javascript.yml)
+[![Test JavaScript status](https://github.com/arduino/arduino-ide/actions/workflows/test-javascript.yml/badge.svg)](https://github.com/arduino/arduino-ide/actions/workflows/test-javascript.yml)
 
-This repository contains the source code of the Arduino IDE 2.x, which is currently in beta stage. If you're looking for the stable IDE, go to the repository of the 1.x version at https://github.com/arduino/Arduino.
+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.
 
-> ⚠️ This is **beta** software. Help us test it!
-
 ![](static/screenshot.png)
 
 ## Download
 
-You can download the latest version from the [software download page on the Arduino website](https://www.arduino.cc/en/software#experimental-software).
-
-### Nightly builds
-
-These builds are generated every day at 03:00 GMT from the `main` branch and
-should be considered unstable:
-
-| Platform  | 32 bit                   | 64 bit                                                                                                 |
-| --------- | ------------------------ | ------------------------------------------------------------------------------------------------------ |
-| Linux     |                          | [Nightly Linux AppImage 64 bit]<br />[Nightly Linux ZIP file 64 bit]                                   |
-| Linux ARM | [🚧 Work in progress...] | [🚧 Work in progress...]                                                                               |
-| Windows   |                          | [Nightly Windows 64 bit installer]<br />[Nightly Windows 64 bit MSI]<br />[Nightly Windows 64 bit ZIP] |
-| macOS     |                          | [Nightly macOS 64 bit]                                                                                 |
-
-[🚧 work in progress...]: https://github.com/arduino/arduino-ide/issues/107
-[nightly linux appimage 64 bit]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_Linux_64bit.AppImage
-[nightly linux zip file 64 bit]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_Linux_64bit.zip
-[nightly windows 64 bit installer]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_Windows_64bit.exe
-[nightly windows 64 bit msi]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_Windows_64bit.msi
-[nightly windows 64 bit zip]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_Windows_64bit.zip
-[nightly macos 64 bit]: https://downloads.arduino.cc/arduino-ide/nightly/arduino-ide_nightly-latest_macOS_64bit.dmg
-
-> These links return an HTTP `302: Found` response, redirecting to latest
-> generated builds by replacing `latest` with the latest available build
-> date, using the format YYYYMMDD (i.e for 2019/Aug/06 `latest` is
-> replaced with `20190806`)
+You can download the latest release version and nightly builds from the [software download page on the Arduino website](https://www.arduino.cc/en/software).
 
 ## Support
 
@@ -47,10 +22,9 @@ If you need assistance, see the [Help Center](https://support.arduino.cc/hc/en-u
 
 ## Bugs & Issues
 
-If you want to report an issue, you can submit it to the [issue tracker](https://github.com/arduino/arduino-ide/issues) of this repository. A few rules apply:
+If you want to report an issue, you can submit it to the [issue tracker](https://github.com/arduino/arduino-ide/issues) of this repository.
 
-- Before posting, please check if the same problem has been already reported by someone else to avoid duplicates.
-- Remember to include as much detail as you can about your hardware set-up, code and steps for reproducing the issue. Make sure you're using an original Arduino board.
+See [**the issue report guide**](docs/contributor-guide/issues.md#issue-report-guide) for instructions.
 
 ### Security
 
@@ -62,16 +36,15 @@ e-mail contact: security@arduino.cc
 
 ## Contributions and development
 
-Contributions are very welcome! You can browse the list of open issues to see what's needed and then you can submit your code using a Pull Request. Please provide detailed descriptions. We also appreciate any help in testing issues and patches contributed by other users.
+Contributions are very welcome! There are several ways to participate in this project, including:
 
-This repository contains the main code, but two more repositories are included during the build process:
+- Fixing bugs
+- Beta testing
+- Translation
 
-- [vscode-arduino-tools](https://github.com/arduino/vscode-arduino-tools): provides support for the language server and the debugger
-- [arduino-language-server](https://github.com/arduino/arduino-language-server): provides the language server that parses Arduino code
+See [**the contributor guide**](docs/CONTRIBUTING.md#contributor-guide) for more information.
 
-See the [BUILDING.md](BUILDING.md) for a technical overview of the application and instructions for building the code.
-
-You can help with the translation of the Arduino IDE to your language here: [Arduino IDE on Transifex](https://www.transifex.com/arduino-1/ide2/dashboard/).
+See the [**development guide**](docs/development.md) for a technical overview of the application and instructions for building the code.
 
 ## Donations
 

arduino-ide-extension/README.md

@@ -55,19 +55,32 @@ 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"`:
-   - `"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.
+
+- `"cli"`:
+  - `"version"` type `string` | `{ owner: string, repo: string, commitish?: string }`: if the type is a `string` and is a valid semver, it will get the corresponding [released](https://github.com/arduino/arduino-cli/releases) CLI. If the type is `string` and is a [date in `YYYYMMDD`](https://arduino.github.io/arduino-cli/latest/installation/#nightly-builds) format, it will get a nightly CLI. If the type is an object, a CLI, build from the sources in the `owner/repo` will be used. If `commitish` is not defined, the HEAD of the default branch will be used. In any other cases an error is thrown.
 
 #### Rebuild gRPC protocol interfaces
-  - Some CLI updates can bring changes to the gRPC interfaces, as the API might change. gRPC interfaces can be updated running the command
-    `yarn --cwd arduino-ide-extension generate-protocol`
+
+- Some CLI updates can bring changes to the gRPC interfaces, as the API might change. gRPC interfaces can be updated running the command
+  `yarn --cwd arduino-ide-extension generate-protocol`
+
+### Update **clangd** and **ClangFormat**
+
+The [**clangd** C++ language server](https://clangd.llvm.org/) and the [**ClangFormat** code formatter](https://clang.llvm.org/docs/ClangFormat.html) tool dependencies are managed in parallel. Updating them to a different version is done by the following procedure:
+
+1. If the target version is not already [available from the `arduino/clang-static-binaries` repository](https://github.com/arduino/clang-static-binaries/releases), submit [an issue there](https://github.com/arduino/clang-static-binaries/issues) requesting a build and wait for that to be completed.
+1. Validate the **ClangFormat** configuration for the target version by following the instructions [**here**](https://github.com/arduino/tooling-project-assets/tree/main/other/clang-format-configuration#clangformat-version-updates)
+1. Submit a pull request in the `arduino/arduino-ide` repository to update the version in the `arduino.clangd.version` key of [`package.json`](package.json).
+1. Submit a pull request in [the `arduino/tooling-project-assets` repository](https://github.com/arduino/tooling-project-assets) to update the version in the `vars.DEFAULT_CLANG_FORMAT_VERSION` field of [`Taskfile.yml`](https://github.com/arduino/tooling-project-assets/blob/main/Taskfile.yml).
 
 ### Customize Icons
+
 ArduinoIde uses a customized version of FontAwesome.
 In order to update/replace icons follow the following steps:
-  - import the file `arduino-icons.json` in [Icomoon](https://icomoon.io/app/#/projects)
-  - load it
-  - edit the icons as needed
-  - !! download the **new** `arduino-icons.json` file and put it in this repo
-  - Click on "Generate Font" in Icomoon, then download
-  - place the updated fonts in the `src/style/fonts` directory
+
+- 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,128 +1,136 @@
 {
   "name": "arduino-ide-extension",
-  "version": "2.0.0-rc9.1",
+  "version": "2.3.7",
   "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",
+    "lint": "eslint .",
+    "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: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.25.0",
-    "@theia/core": "1.25.0",
-    "@theia/editor": "1.25.0",
-    "@theia/electron": "1.25.0",
-    "@theia/filesystem": "1.25.0",
-    "@theia/keymaps": "1.25.0",
-    "@theia/markers": "1.25.0",
-    "@theia/monaco": "1.25.0",
-    "@theia/navigator": "1.25.0",
-    "@theia/outline-view": "1.25.0",
-    "@theia/output": "1.25.0",
-    "@theia/preferences": "1.25.0",
-    "@theia/search-in-workspace": "1.25.0",
-    "@theia/terminal": "1.25.0",
-    "@theia/workspace": "1.25.0",
+    "@grpc/grpc-js": "^1.8.14",
+    "@theia/application-package": "1.57.0",
+    "@theia/core": "1.57.0",
+    "@theia/debug": "1.57.0",
+    "@theia/editor": "1.57.0",
+    "@theia/electron": "1.57.0",
+    "@theia/filesystem": "1.57.0",
+    "@theia/keymaps": "1.57.0",
+    "@theia/markers": "1.57.0",
+    "@theia/messages": "1.57.0",
+    "@theia/monaco": "1.57.0",
+    "@theia/monaco-editor-core": "1.83.101",
+    "@theia/navigator": "1.57.0",
+    "@theia/outline-view": "1.57.0",
+    "@theia/output": "1.57.0",
+    "@theia/plugin-ext": "1.57.0",
+    "@theia/plugin-ext-vscode": "1.57.0",
+    "@theia/preferences": "1.57.0",
+    "@theia/scm": "1.57.0",
+    "@theia/search-in-workspace": "1.57.0",
+    "@theia/terminal": "1.57.0",
+    "@theia/test": "1.57.0",
+    "@theia/typehierarchy": "1.57.0",
+    "@theia/workspace": "1.57.0",
     "@tippyjs/react": "^4.2.5",
-    "@types/atob": "^2.1.2",
-    "@types/auth0-js": "^9.14.0",
+    "@types/auth0-js": "^9.21.3",
     "@types/btoa": "^1.2.3",
     "@types/dateformat": "^3.0.1",
-    "@types/deep-equal": "^1.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/ncp": "^2.0.4",
     "@types/node-fetch": "^2.5.7",
+    "@types/p-queue": "^2.3.1",
     "@types/ps-tree": "^1.1.0",
-    "@types/react-select": "^3.0.0",
-    "@types/react-tabs": "^2.3.2",
     "@types/temp": "^0.8.34",
-    "@types/which": "^1.3.1",
-    "ajv": "^6.5.3",
-    "arduino-serial-plotter-webapp": "0.1.0",
+    "arduino-serial-plotter-webapp": "0.2.0",
     "async-mutex": "^0.3.0",
-    "atob": "^2.1.2",
-    "auth0-js": "^9.14.0",
+    "auth0-js": "^9.23.2",
     "btoa": "^1.2.1",
     "classnames": "^2.3.1",
+    "cross-fetch": "^3.1.5",
     "dateformat": "^3.0.3",
-    "deep-equal": "^2.0.5",
-    "deepmerge": "2.0.1",
+    "deepmerge": "^4.2.2",
+    "dompurify": "^2.4.7",
+    "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",
-    "glob": "^7.1.6",
+    "filename-reserved-regex": "^2.0.0",
+    "fqbn": "^1.0.5",
+    "glob": "10.4.4",
     "google-protobuf": "^3.20.1",
     "hash.js": "^1.1.7",
-    "is-valid-path": "^0.1.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",
     "keytar": "7.2.0",
     "lodash.debounce": "^4.0.8",
-    "ncp": "^2.0.0",
+    "minimatch": "^3.1.2",
     "node-fetch": "^2.6.1",
+    "node-log-rotate": "^0.1.5",
     "open": "^8.0.6",
-    "p-queue": "^5.0.0",
+    "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.0",
+    "react-disable": "^0.1.1",
     "react-markdown": "^8.0.0",
-    "react-select": "^3.0.4",
-    "react-tabs": "^3.1.2",
+    "react-perfect-scrollbar": "^1.5.8",
+    "react-select": "^5.6.0",
+    "react-tabs": "^6.1.0",
     "react-window": "^1.8.6",
     "semver": "^7.3.2",
     "string-natural-compare": "^2.0.3",
     "temp": "^0.9.1",
     "temp-dir": "^2.0.0",
     "tree-kill": "^1.2.1",
-    "upath": "^1.1.2",
-    "url": "^0.11.0",
-    "which": "^1.3.1"
+    "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",
-    "@types/sinon": "^10.0.6",
-    "@types/sinon-chai": "^3.2.6",
+    "@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",
-    "protoc": "^1.0.4",
-    "shelljs": "^0.8.3",
-    "sinon": "^12.0.1",
-    "sinon-chai": "^3.7.0",
-    "typemoq": "^2.1.0",
-    "uuid": "^3.2.1",
-    "yargs": "^11.1.0"
+    "ncp": "^2.0.0",
+    "rimraf": "^5.0.0"
   },
   "optionalDependencies": {
-    "grpc-tools": "^1.9.0"
+    "@pingghost/protoc": "^1.0.2",
+    "grpc-tools": "^1.12.4"
   },
   "mocha": {
     "require": [
@@ -142,30 +150,42 @@
     "examples"
   ],
   "theiaExtensions": [
+    {
+      "preload": "lib/electron-browser/preload"
+    },
     {
       "backend": "lib/node/arduino-ide-backend-module",
       "frontend": "lib/browser/arduino-ide-frontend-module"
     },
     {
-      "frontend": "lib/browser/theia/core/browser-menu-module",
       "frontendElectron": "lib/electron-browser/theia/core/electron-menu-module"
     },
+    {
+      "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": "0.25.1"
+    "arduino-cli": {
+      "version": "1.2.0"
     },
-    "fwuploader": {
-      "version": "2.2.0"
+    "arduino-fwuploader": {
+      "version": "2.4.1"
+    },
+    "arduino-language-server": {
+      "version": {
+        "owner": "arduino",
+        "repo": "arduino-language-server",
+        "commitish": "05ec308"
+      }
     },
     "clangd": {
       "version": "14.0.0"
-    },
-    "languageServer": {
-      "version": "0.7.1"
     }
   }
 }

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

@@ -34,7 +34,7 @@
   }, '');
 
   const args = process.argv.slice(2);
-  if (args.length == 0) {
+  if (args.length === 0) {
     console.error('Missing argument to destination file');
     process.exit(1);
   }

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

@@ -2,11 +2,10 @@
 
 (async () => {
   const path = require('path');
-  const shell = require('shelljs');
   const semver = require('semver');
   const moment = require('moment');
   const downloader = require('./downloader');
-  const { goBuildFromGit } = require('./utils');
+  const { taskBuildFromGit } = require('./utils');
 
   const version = (() => {
     const pkg = require(path.join(__dirname, '..', 'package.json'));
@@ -19,7 +18,7 @@
       return undefined;
     }
 
-    const { cli } = arduino;
+    const cli = arduino['arduino-cli'];
     if (!cli) {
       return undefined;
     }
@@ -29,19 +28,28 @@
   })();
 
   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 = (() => {
       switch (platform) {
         case 'darwin':
+          if (arch === 'arm64') {
+            return 'macOS_ARM64.tar.gz';
+          }
           return 'macOS_64bit.tar.gz';
         case 'win32':
           return 'Windows_64bit.zip';
@@ -62,26 +70,26 @@
       }
     })();
     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 {
-    goBuildFromGit(version, destinationPath, 'CLI');
+    taskBuildFromGit(version, destinationPath, 'CLI');
   }
 })();

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

@@ -1,38 +1,61 @@
 // @ts-check
 
 // The version to use.
-const version = '1.9.1';
+const version = '1.10.2';
 
 (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.9.1';
     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':
-          return 'macOS_64bit.tar.gz';
+          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,29 +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(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;
@@ -92,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') {
@@ -104,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, {
-    strip: 1,
-  }); // `strip`: the new clangd (12.x) is zipped into a folder, so we have to strip the outmost folder.
+  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.
 
   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,82 +1,88 @@
 // @ts-check
 
 (async () => {
+  const os = require('node:os');
+  const path = require('node:path');
+  const decompress = require('decompress');
+  const unzip = require('decompress-unzip');
+  const { mkdirSync, promises: fs, rmSync, existsSync } = require('node:fs');
+  const { exec } = require('./utils');
+  const { glob } = require('glob');
+  const { SemVer, gte, valid: validSemVer, eq } = require('semver');
+  // Use a node-protoc fork until apple arm32 is supported
+  // https://github.com/YePpHa/node-protoc/pull/10
+  const protoc = path.dirname(require('@pingghost/protoc/protoc'));
 
-    const os = require('os');
-    const path = require('path');
-    const glob = require('glob');
-    const { v4 } = require('uuid');
-    const shell = require('shelljs');
-    const protoc = path.dirname(require('protoc/protoc'));
-    shell.env.PATH = `${shell.env.PATH}${path.delimiter}${protoc}`;
-    shell.env.PATH = `${shell.env.PATH}${path.delimiter}${path.join(__dirname, '..', 'node_modules', '.bin')}`;
-
-    const repository = path.join(os.tmpdir(), `${v4()}-arduino-cli`);
-    if (shell.mkdir('-p', repository).code !== 0) {
-        shell.exit(1);
+  const { owner, repo, commitish } = (() => {
+    const pkg = require(path.join(__dirname, '..', 'package.json'));
+    if (!pkg) {
+      console.log(`Could not parse the 'package.json'.`);
+      process.exit(1);
     }
 
-    const { owner, repo, commitish } = (() => {
-        const pkg = require(path.join(__dirname, '..', 'package.json'));
-        if (!pkg) {
-            shell.echo(`Could not parse the 'package.json'.`);
-            shell.exit(1);
-        }
-
-        const { arduino } = pkg;
-        if (!arduino) {
-            return { owner: 'arduino', repo: 'arduino-cli' };
-        }
-
-        const { cli } = arduino;
-        if (!cli) {
-            return { owner: 'arduino', repo: 'arduino-cli' };
-        }
-
-        const { version } = cli;
-        if (!version) {
-            return { owner: 'arduino', repo: 'arduino-cli' };
-        }
-
-        if (typeof version === 'string') {
-            return { owner: 'arduino', repo: 'arduino-cli' };
-        }
-
-        // We assume an object with `owner`, `repo`, commitish?` properties.
-        const { owner, repo, commitish } = version;
-        if (!owner) {
-            shell.echo(`Could not retrieve 'owner' from ${JSON.stringify(version)}`);
-            shell.exit(1);
-        }
-        if (!repo) {
-            shell.echo(`Could not retrieve 'repo' from ${JSON.stringify(version)}`);
-            shell.exit(1);
-        }
-
-        return { owner, repo, commitish };
-    })();
-
-    const url = `https://github.com/${owner}/${repo}.git`;
-    shell.echo(`>>> Cloning repository from '${url}'...`);
-    if (shell.exec(`git clone ${url} ${repository}`).code !== 0) {
-        shell.exit(1);
+    const defaultVersion = {
+      owner: 'arduino',
+      repo: 'arduino-cli',
+      commitish: undefined,
+    };
+    const { arduino } = pkg;
+    if (!arduino) {
+      return defaultVersion;
     }
-    shell.echo(`<<< Repository cloned.`);
 
-    const { platform } = process;
-    const build = path.join(__dirname, '..', 'build');
-    const cli = path.join(build, `arduino-cli${platform === 'win32' ? '.exe' : ''}`);
-    const versionJson = shell.exec(`${cli} version --format json`).trim();
-    if (!versionJson) {
-        shell.echo(`Could not retrieve the CLI version from ${cli}.`);
-        shell.exit(1);
+    const cli = arduino['arduino-cli'];
+    if (!cli) {
+      return defaultVersion;
     }
-    // As of today (28.01.2021), the `VersionString` can be one of the followings:
-    //  - `nightly-YYYYMMDD` stands for the nightly build, we use the , the `commitish` from the `package.json` to check out the code.
-    //  - `0.0.0-git` for local builds, we use the `commitish` from the `package.json` to check out the code and generate the APIs.
-    //  - `git-snapshot` for local build executed via `task build`. We do not do this.
-    //  - rest, we assume it is a valid semver and has the corresponding tagged code, we use the tag to generate the APIs from the `proto` files.
-    /*
+
+    const { version } = cli;
+    if (!version) {
+      return defaultVersion;
+    }
+
+    if (typeof version === 'string') {
+      return defaultVersion;
+    }
+
+    // We assume an object with `owner`, `repo`, commitish?` properties.
+    const { owner, repo, commitish } = version;
+    if (!owner) {
+      console.log(`Could not retrieve 'owner' from ${JSON.stringify(version)}`);
+      process.exit(1);
+    }
+    if (!repo) {
+      console.log(`Could not retrieve 'repo' from ${JSON.stringify(version)}`);
+      process.exit(1);
+    }
+
+    return { owner, repo, commitish };
+  })();
+
+  const { platform } = process;
+  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) {
+    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.
+  //  - `0.0.0-git` for local builds, we use the `commitish` from the `package.json` to check out the code and generate the APIs.
+  //  - `git-snapshot` for local build executed via `task build`. We do not do this.
+  //  - rest, we assume it is a valid semver and has the corresponding tagged code, we use the tag to generate the APIs from the `proto` files.
+  /*
     {
       "Application": "arduino-cli",
       "VersionString": "nightly-20210126",
@@ -84,73 +90,200 @@
       "Status": "alpha",
       "Date": "2021-01-26T01:46:31Z"
     }
-    */
-    const versionObject = JSON.parse(versionJson);
-    const version = versionObject.VersionString;
-    if (version && !version.startsWith('nightly-') && version !== '0.0.0-git' && version !== 'git-snapshot') {
-        shell.echo(`>>> Checking out tagged version: '${version}'...`);
-        shell.exec(`git -C ${repository} fetch --all --tags`);
-        if (shell.exec(`git -C ${repository} checkout tags/${version} -b ${version}`).code !== 0) {
-            shell.exit(1);
-        }
-        shell.echo(`<<< Checked out tagged version: '${commitish}'.`);
+  */
+  const versionObject = JSON.parse(versionJson);
+
+  async function globProtos(folder, pattern = '**/*.proto') {
+    let protos = [];
+    try {
+      const matches = await glob(pattern, { cwd: folder });
+      protos = matches.map((filename) => path.join(folder, filename));
+    } catch (error) {
+      console.log(error.stack ?? error.message);
+    }
+    return protos;
+  }
+
+  async function getProtosFromRepo(
+    commitish = '',
+    version = '',
+    owner = 'arduino',
+    repo = 'arduino-cli'
+  ) {
+    const repoFolder = await fs.mkdtemp(path.join(os.tmpdir(), 'arduino-cli-'));
+
+    const url = `https://github.com/${owner}/${repo}.git`;
+    console.log(`>>> Cloning repository from '${url}'...`);
+    exec('git', ['clone', url, repoFolder], { logStdout: true });
+    console.log(`<<< Repository cloned.`);
+
+    if (validSemVer(version)) {
+      let versionTag = version;
+      // https://github.com/arduino/arduino-cli/pull/2374
+      if (
+        gte(new SemVer(version, { loose: true }), new SemVer('0.35.0-rc.1'))
+      ) {
+        versionTag = `v${version}`;
+      }
+      console.log(`>>> Checking out tagged version: '${versionTag}'...`);
+      exec('git', ['-C', repoFolder, 'fetch', '--all', '--tags'], {
+        logStdout: true,
+      });
+      exec(
+        'git',
+        ['-C', repoFolder, 'checkout', `tags/${versionTag}`, '-b', versionTag],
+        { logStdout: true }
+      );
+      console.log(`<<< Checked out tagged version: '${versionTag}'.`);
     } else if (commitish) {
-        shell.echo(`>>> Checking out commitish from 'package.json': '${commitish}'...`);
-        if (shell.exec(`git -C ${repository} checkout ${commitish}`).code !== 0) {
-            shell.exit(1);
-        }
-        shell.echo(`<<< Checked out commitish from 'package.json': '${commitish}'.`);
-    } else if (versionObject.Commit) {
-        shell.echo(`>>> Checking out commitish from the CLI: '${versionObject.Commit}'...`);
-        if (shell.exec(`git -C ${repository} checkout ${versionObject.Commit}`).code !== 0) {
-            shell.exit(1);
-        }
-        shell.echo(`<<< Checked out commitish from the CLI: '${versionObject.Commit}'.`);
+      console.log(`>>> Checking out commitish: '${commitish}'...`);
+      exec('git', ['-C', repoFolder, 'checkout', commitish], {
+        logStdout: true,
+      });
+      console.log(`<<< Checked out commitish: '${commitish}'.`);
     } 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);
+    const rpcFolder = await fs.mkdtemp(
+      path.join(os.tmpdir(), 'arduino-cli-rpc')
+    );
+
+    // Copy the the repository rpc folder so we can remove the repository
+    await fs.cp(path.join(repoFolder, 'rpc'), path.join(rpcFolder), {
+      recursive: true,
+    });
+    rmSync(repoFolder, { recursive: true, maxRetries: 5, force: true });
+
+    // Patch for https://github.com/arduino/arduino-cli/issues/2755
+    // Google proto files are removed from source since v1.1.0
+    if (!existsSync(path.join(rpcFolder, 'google'))) {
+      // Include packaged google proto files from v1.1.1
+      // See https://github.com/arduino/arduino-cli/pull/2761
+      console.log(`>>> Missing google proto files. Including from v1.1.1...`);
+      const v111ProtoFolder = await getProtosFromZip('1.1.1');
+
+      // Create an return a folder name google in rpcFolder
+      const googleFolder = path.join(rpcFolder, 'google');
+      await fs.cp(path.join(v111ProtoFolder, 'google'), googleFolder, {
+        recursive: true,
+      });
+      console.log(`<<< Included google proto files from v1.1.1.`);
     }
 
-    const rpc = path.join(repository, 'rpc');
-    const out = path.join(__dirname, '..', 'src', 'node', 'cli-protocol');
-    shell.mkdir('-p', out);
+    return rpcFolder;
+  }
 
-    const protos = await new Promise(resolve =>
-        glob('**/*.proto', { cwd: rpc }, (error, matches) => {
-            if (error) {
-                shell.echo(error.stack);
-                resolve([]);
-                return;
-            }
-            resolve(matches.map(filename => path.join(rpc, filename)));
-        }));
-    if (!protos || protos.length === 0) {
-        shell.echo(`Could not find any .proto files under ${rpc}.`);
-        shell.exit(1);
+  async function getProtosFromZip(version) {
+    if (!version) {
+      console.log(`Could not download proto files: CLI version not provided.`);
+      process.exit(1);
     }
+    console.log(`>>> Downloading proto files from zip for ${version}.`);
 
+    const url = `https://downloads.arduino.cc/arduino-cli/arduino-cli_${version}_proto.zip`;
+    const protos = await fs.mkdtemp(
+      path.join(os.tmpdir(), 'arduino-cli-proto')
+    );
+
+    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);
+
+    await decompress(data, protos, {
+      plugins: [unzip()],
+      filter: (file) => file.path.endsWith('.proto'),
+    });
+
+    console.log(
+      `<<< Finished downloading and extracting proto files for ${version}.`
+    );
+
+    return protos;
+  }
+
+  let protosFolder;
+
+  if (commitish) {
+    protosFolder = await getProtosFromRepo(commitish, undefined, owner, repo);
+  } else if (
+    versionObject.VersionString &&
+    validSemVer(versionObject.VersionString)
+  ) {
+    const version = versionObject.VersionString;
+    // v1.1.0 does not contains google proto files in zip
+    // See https://github.com/arduino/arduino-cli/issues/2755
+    const isV110 = eq(new SemVer(version, { loose: true }), '1.1.0');
+    protosFolder = isV110
+      ? await getProtosFromRepo(undefined, version)
+      : await getProtosFromZip(version);
+  } else if (versionObject.Commit) {
+    protosFolder = await getProtosFromRepo(versionObject.Commit);
+  }
+
+  if (!protosFolder) {
+    console.log(`Could not get proto files: missing commitish or version.`);
+    process.exit(1);
+  }
+
+  const protos = await globProtos(protosFolder);
+
+  if (!protos || protos.length === 0) {
+    rmSync(protosFolder, { recursive: true, maxRetries: 5, force: true });
+    console.log(`Could not find any .proto files under ${protosFolder}.`);
+    process.exit(1);
+  }
+
+  console.log('>>> Generating TS/JS API from:');
+
+  const out = path.join(__dirname, '..', 'src', 'node', 'cli-protocol');
+  // Must wipe the gen output folder. Otherwise, dangling service implementation remain in IDE2 code,
+  // although it has been removed from the proto file.
+  // For example, https://github.com/arduino/arduino-cli/commit/50a8bf5c3e61d5b661ccfcd6a055e82eeb510859.
+  // rmSync(out, { recursive: true, maxRetries: 5, force: true });
+  mkdirSync(out, { recursive: true });
+
+  try {
     // 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',
+        protosFolder,
+        ...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',
+        protosFolder,
+        ...protos,
+      ],
+      { logStdout: true }
+    );
+  } catch (error) {
+    console.log(error);
+  } finally {
+    rmSync(protosFolder, { recursive: true, maxRetries: 5, force: true });
+  }
 
+  console.log('<<< Generation was successful.');
 })();

arduino-ide-extension/scripts/utils.js

@@ -1,3 +1,39 @@
+// @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/).
+ *
+ * @param version {object} the version object.
+ * @param destinationPath {string} the absolute path of the output binary. For example, `C:\\folder\\arduino-cli.exe` or `/path/to/arduino-language-server`
+ * @param taskName {string} for the CLI logging . Can be `'CLI'` or `'language-server'`, etc.
+ */
+exports.taskBuildFromGit = (version, destinationPath, taskName) => {
+  return buildFromGit('task', version, destinationPath, taskName);
+};
+
 /**
  * Clones something from GitHub and builds it with `Golang`.
  *
@@ -6,87 +42,102 @@
  * @param taskName {string} for the CLI logging . Can be `'CLI'` or `'language-server'`, etc.
  */
 exports.goBuildFromGit = (version, destinationPath, taskName) => {
-  const fs = require('fs');
-  const path = require('path');
+  return buildFromGit('go', version, destinationPath, taskName);
+};
+
+/**
+ * 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('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('go 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,52 +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-contribution';
+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 { SketchesService } from '../common/protocol';
-import {
-  MAIN_MENU_BAR,
-  MenuContribution,
-  MenuModelRegistry,
-} from '@theia/core';
-import {
-  Dialog,
-  FrontendApplication,
-  FrontendApplicationContribution,
-  OnWillStopAction,
-} 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 {
-  CurrentSketch,
-  SketchesServiceClientImpl,
-} from '../common/protocol/sketches-service-client-impl';
-import { ArduinoPreferences } from './arduino-preferences';
 import { BoardsServiceProvider } from './boards/boards-service-provider';
 import { BoardsToolBarItem } from './boards/boards-toolbar-item';
-import { SaveAsSketch } from './contributions/save-as-sketch';
 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
@@ -55,7 +50,8 @@ export class ArduinoFrontendContribution
     TabBarToolbarContribution,
     CommandContribution,
     MenuContribution,
-    ColorContribution
+    ColorContribution,
+    StylingParticipant
 {
   @inject(MessageService)
   private readonly messageService: MessageService;
@@ -63,23 +59,17 @@ export class ArduinoFrontendContribution
   @inject(BoardsServiceProvider)
   private readonly boardsServiceProvider: BoardsServiceProvider;
 
-  @inject(SketchesService)
-  private readonly sketchService: SketchesService;
-
   @inject(CommandRegistry)
   private readonly commandRegistry: CommandRegistry;
 
-  @inject(ArduinoPreferences)
-  private readonly arduinoPreferences: ArduinoPreferences;
-
-  @inject(SketchesServiceClientImpl)
-  private readonly sketchServiceClient: SketchesServiceClientImpl;
+  @inject(ElectronWindowPreferences)
+  private readonly electronWindowPreferences: ElectronWindowPreferences;
 
   @inject(FrontendApplicationStateService)
   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(
@@ -91,30 +81,25 @@ export class ArduinoFrontendContribution
     }
   }
 
-  async onStart(app: FrontendApplication): Promise<void> {
-    this.arduinoPreferences.onPreferenceChanged((event) => {
+  onStart(): void {
+    this.electronWindowPreferences.onPreferenceChanged((event) => {
       if (event.newValue !== event.oldValue) {
         switch (event.preferenceName) {
-          case 'arduino.window.zoomLevel':
+          case 'window.zoomLevel':
             if (typeof event.newValue === 'number') {
-              const webContents = remote.getCurrentWebContents();
-              webContents.setZoomLevel(event.newValue || 0);
+              window.electronTheiaCore.setZoomLevel(event.newValue || 0);
             }
             break;
         }
       }
     });
     this.appStateService.reachedState('ready').then(() =>
-      this.arduinoPreferences.ready.then(() => {
-        const webContents = remote.getCurrentWebContents();
-        const zoomLevel = this.arduinoPreferences.get(
-          'arduino.window.zoomLevel'
-        );
-        webContents.setZoomLevel(zoomLevel);
+      this.electronWindowPreferences.ready.then(() => {
+        const zoomLevel =
+          this.electronWindowPreferences.get('window.zoomLevel');
+        window.electronTheiaCore.setZoomLevel(zoomLevel);
       })
     );
-    // Removes the _Settings_ (cog) icon from the left sidebar
-    app.shell.leftPanelHandler.removeBottomMenu('settings-menu');
   }
 
   registerToolbarItems(registry: TabBarToolbarRegistry): void {
@@ -188,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.',
@@ -198,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.',
@@ -208,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',
@@ -218,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"',
@@ -228,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)',
@@ -238,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.',
       },
@@ -277,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.',
@@ -287,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.',
       },
@@ -296,7 +289,8 @@ 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.',
@@ -304,57 +298,182 @@ export class ArduinoFrontendContribution
     );
   }
 
-  // TODO: should be handled by `Close` contribution. https://github.com/arduino/arduino-ide/issues/1016
-  onWillStop(): OnWillStopAction {
-    return {
-      reason: 'temp-sketch',
-      action: () => {
-        return this.showTempSketchDialog();
-      },
-    };
-  }
-
-  private async showTempSketchDialog(): Promise<boolean> {
-    const sketch = await this.sketchServiceClient.currentSketch();
-    if (!CurrentSketch.isValid(sketch)) {
-      return true;
-    }
-    const isTemp = await this.sketchService.isTemp(sketch);
-    if (!isTemp) {
-      return true;
-    }
-    const messageBoxResult = await remote.dialog.showMessageBox(
-      remote.getCurrentWindow(),
-      {
-        message: nls.localize(
-          'arduino/sketch/saveTempSketch',
-          'Save your sketch to open it again later.'
-        ),
-        title: nls.localize(
-          'theia/core/quitTitle',
-          'Are you sure you want to quit?'
-        ),
-        type: 'question',
-        buttons: [
-          Dialog.CANCEL,
-          nls.localizeByDefault('Save As...'),
-          nls.localizeByDefault("Don't Save"),
-        ],
-      }
+  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'
     );
-    const result = messageBoxResult.response;
-    if (result === 2) {
-      return true;
-    } else if (result === 1) {
-      return !!(await this.commandRegistry.executeCommand(
-        SaveAsSketch.Commands.SAVE_AS_SKETCH.id,
-        {
-          execOnlyIfTemp: false,
-          openAfterMove: false,
-          wipeOriginal: true,
+    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};
+          }
+        `);
+      }
     }
-    return false;
   }
 }

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

@@ -1,17 +1,12 @@
 import '../../src/browser/style/index.css';
-import { ContainerModule } from '@theia/core/shared/inversify';
+import { Container, ContainerModule } from '@theia/core/shared/inversify';
 import { WidgetFactory } from '@theia/core/lib/browser/widget-manager';
 import { CommandContribution } from '@theia/core/lib/common/command';
 import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
-import {
-  TabBarToolbarContribution,
-  TabBarToolbarFactory,
-} from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging/ws-connection-provider';
-import {
-  FrontendApplicationContribution,
-  FrontendApplication as TheiaFrontendApplication,
-} from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplication as TheiaFrontendApplication } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
 import { LibraryListWidget } from './library/library-list-widget';
 import { ArduinoFrontendContribution } from './arduino-frontend-contribution';
 import {
@@ -26,11 +21,14 @@ import {
   SketchesService,
   SketchesServicePath,
 } from '../common/protocol/sketches-service';
-import { SketchesServiceClientImpl } from '../common/protocol/sketches-service-client-impl';
+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';
@@ -53,8 +51,6 @@ import {
   DockPanelRenderer as TheiaDockPanelRenderer,
   TabBarRendererFactory,
   ContextMenuRenderer,
-  createTreeContainer,
-  TreeWidget,
 } from '@theia/core/lib/browser';
 import { MenuContribution } from '@theia/core/lib/common/menu';
 import {
@@ -66,7 +62,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';
@@ -84,28 +79,30 @@ import { ProblemManager as TheiaProblemManager } from '@theia/markers/lib/browse
 import { ProblemManager } from './theia/markers/problem-manager';
 import { BoardsAutoInstaller } from './boards/boards-auto-installer';
 import { ShellLayoutRestorer } from './theia/core/shell-layout-restorer';
-import { ListItemRenderer } from './widgets/component-list/list-item-renderer';
-import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
 import {
-  MonacoThemeJson,
-  MonacoThemingService,
-} from '@theia/monaco/lib/browser/monaco-theming-service';
+  ArduinoComponentContextMenuRenderer,
+  ListItemRenderer,
+} from './widgets/component-list/list-item-renderer';
+import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
+
 import {
   ArduinoDaemonPath,
   ArduinoDaemon,
 } from '../common/protocol/arduino-daemon';
-import { EditorCommandContribution as TheiaEditorCommandContribution } from '@theia/editor/lib/browser';
 import {
   FrontendConnectionStatusService,
   ApplicationConnectionStatusContribution,
+  DaemonPort,
+  IsOnline,
 } from './theia/core/connection-status-service';
 import {
   FrontendConnectionStatusService as TheiaFrontendConnectionStatusService,
   ApplicationConnectionStatusContribution as TheiaApplicationConnectionStatusContribution,
 } from '@theia/core/lib/browser/connection-status-service';
-import { BoardsDataMenuUpdater } from './boards/boards-data-menu-updater';
+import { BoardsDataMenuUpdater } from './contributions/boards-data-menu-updater';
 import { BoardsDataStore } from './boards/boards-data-store';
-import { ILogger } from '@theia/core';
+import { ILogger } from '@theia/core/lib/common/logger';
+import { bindContributionProvider } from '@theia/core/lib/common/contribution-provider';
 import {
   FileSystemExt,
   FileSystemExtPath,
@@ -125,7 +122,10 @@ import { OpenSketch } from './contributions/open-sketch';
 import { Close } from './contributions/close';
 import { SaveAsSketch } from './contributions/save-as-sketch';
 import { SaveSketch } from './contributions/save-sketch';
-import { VerifySketch } from './contributions/verify-sketch';
+import {
+  CompileSummaryProvider,
+  VerifySketch,
+} from './contributions/verify-sketch';
 import { UploadSketch } from './contributions/upload-sketch';
 import { CommonFrontendContribution } from './theia/core/common-frontend-contribution';
 import { EditContributions } from './contributions/edit-contributions';
@@ -134,15 +134,12 @@ import { PreferencesContribution as TheiaPreferencesContribution } from '@theia/
 import { PreferencesContribution } from './theia/preferences/preferences-contribution';
 import { QuitApp } from './contributions/quit-app';
 import { SketchControl } from './contributions/sketch-control';
-import { Settings } from './contributions/settings';
+import { OpenSettings } from './contributions/open-settings';
 import { WorkspaceCommandContribution } from './theia/workspace/workspace-commands';
 import { WorkspaceDeleteHandler as TheiaWorkspaceDeleteHandler } from '@theia/workspace/lib/browser/workspace-delete-handler';
 import { WorkspaceDeleteHandler } from './theia/workspace/workspace-delete-handler';
-import { TabBarToolbar } from './theia/core/tab-bar-toolbar';
 import { EditorWidgetFactory as TheiaEditorWidgetFactory } from '@theia/editor/lib/browser/editor-widget-factory';
 import { EditorWidgetFactory } from './theia/editor/editor-widget-factory';
-import { OutputWidget as TheiaOutputWidget } from '@theia/output/lib/browser/output-widget';
-import { OutputWidget } from './theia/output/output-widget';
 import { BurnBootloader } from './contributions/burn-bootloader';
 import {
   ExamplesServicePath,
@@ -180,12 +177,9 @@ import {
 import { About } from './contributions/about';
 import { IconThemeService } from '@theia/core/lib/browser/icon-theme-service';
 import { TabBarRenderer } from './theia/core/tab-bars';
-import { EditorCommandContribution } from './theia/editor/editor-command';
 import { NavigatorTabBarDecorator as TheiaNavigatorTabBarDecorator } from '@theia/navigator/lib/browser/navigator-tab-bar-decorator';
 import { NavigatorTabBarDecorator } from './theia/navigator/navigator-tab-bar-decorator';
-import { Debug } from './contributions/debug';
-import { DebugSessionManager } from './theia/debug/debug-session-manager';
-import { DebugSessionManager as TheiaDebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
+import { 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,15 +202,13 @@ import { WorkspaceVariableContribution as TheiaWorkspaceVariableContribution } f
 import { WorkspaceVariableContribution } from './theia/workspace/workspace-variable-contribution';
 import { DebugConfigurationManager } from './theia/debug/debug-configuration-manager';
 import { DebugConfigurationManager as TheiaDebugConfigurationManager } from '@theia/debug/lib/browser/debug-configuration-manager';
-import { SearchInWorkspaceWidget as TheiaSearchInWorkspaceWidget } from '@theia/search-in-workspace/lib/browser/search-in-workspace-widget';
-import { SearchInWorkspaceWidget } from './theia/search-in-workspace/search-in-workspace-widget';
 import { SearchInWorkspaceFactory as TheiaSearchInWorkspaceFactory } from '@theia/search-in-workspace/lib/browser/search-in-workspace-factory';
 import { SearchInWorkspaceFactory } from './theia/search-in-workspace/search-in-workspace-factory';
-import { SearchInWorkspaceResultTreeWidget as TheiaSearchInWorkspaceResultTreeWidget } from '@theia/search-in-workspace/lib/browser/search-in-workspace-result-tree-widget';
-import { SearchInWorkspaceResultTreeWidget } from './theia/search-in-workspace/search-in-workspace-result-tree-widget';
 import { MonacoEditorProvider } from './theia/monaco/monaco-editor-provider';
-import { MonacoEditorProvider as TheiaMonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
-import { StorageWrapper } from './storage-wrapper';
+import {
+  MonacoEditorFactory,
+  MonacoEditorProvider as TheiaMonacoEditorProvider,
+} from '@theia/monaco/lib/browser/monaco-editor-provider';
 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';
@@ -245,9 +237,7 @@ import { UploadFirmware } from './contributions/upload-firmware';
 import {
   UploadFirmwareDialog,
   UploadFirmwareDialogProps,
-  UploadFirmwareDialogWidget,
 } from './dialogs/firmware-uploader/firmware-uploader-dialog';
-
 import { UploadCertificate } from './contributions/upload-certificate';
 import {
   ArduinoFirmwareUploader,
@@ -262,7 +252,6 @@ import { PlotterFrontendContribution } from './serial/plotter/plotter-frontend-c
 import {
   UserFieldsDialog,
   UserFieldsDialogProps,
-  UserFieldsDialogWidget,
 } from './dialogs/user-fields/user-fields-dialog';
 import { nls } from '@theia/core/lib/common';
 import { IDEUpdaterCommands } from './ide-updater/ide-updater-commands';
@@ -275,15 +264,14 @@ import { IDEUpdaterClientImpl } from './ide-updater/ide-updater-client-impl';
 import {
   IDEUpdaterDialog,
   IDEUpdaterDialogProps,
-  IDEUpdaterDialogWidget,
 } from './dialogs/ide-updater/ide-updater-dialog';
-import { ElectronIpcConnectionProvider } from '@theia/core/lib/electron-browser/messaging/electron-ipc-connection-provider';
+import { ElectronIpcConnectionProvider } from '@theia/core/lib/electron-browser/messaging/electron-ipc-connection-source';
 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';
@@ -297,71 +285,123 @@ import { PreferenceTreeGenerator } from './theia/preferences/preference-tree-gen
 import { PreferenceTreeGenerator as TheiaPreferenceTreeGenerator } from '@theia/preferences/lib/browser/util/preference-tree-generator';
 import { AboutDialog } from './theia/core/about-dialog';
 import { AboutDialog as TheiaAboutDialog } from '@theia/core/lib/browser/about-dialog';
-import {
-  SurveyNotificationService,
-  SurveyNotificationServicePath,
-} from '../common/protocol/survey-service';
 import { WindowContribution } from './theia/core/window-contribution';
 import { WindowContribution as TheiaWindowContribution } from '@theia/core/lib/browser/window-contribution';
 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 './widgets/sketchbook/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';
 import { OpenSketchFiles } from './contributions/open-sketch-files';
 import { InoLanguage } from './contributions/ino-language';
 import { SelectedBoard } from './contributions/selected-board';
-import { CheckForUpdates } from './contributions/check-for-updates';
+import { CheckForIDEUpdates } from './contributions/check-for-ide-updates';
 import { OpenBoardsConfig } from './contributions/open-boards-config';
 import { SketchFilesTracker } from './contributions/sketch-files-tracker';
-import { MonacoThemeServiceIsReady } from './utils/window';
-import { Deferred } from '@theia/core/lib/common/promise-util';
-import { StatusBarImpl } from './theia/core/status-bar';
-import { StatusBarImpl as TheiaStatusBarImpl } from '@theia/core/lib/browser';
+import { EditorMenuContribution } from './theia/editor/editor-file';
+import { EditorMenuContribution as TheiaEditorMenuContribution } from '@theia/editor/lib/browser/editor-menu';
+import { PreferencesEditorWidget as TheiaPreferencesEditorWidget } from '@theia/preferences/lib/browser/views/preference-editor-widget';
+import { PreferencesEditorWidget } from './theia/preferences/preference-editor-widget';
+import { PreferencesWidget } from '@theia/preferences/lib/browser/views/preference-widget';
+import { createPreferencesWidgetContainer } from '@theia/preferences/lib/browser/views/preference-widget-bindings';
+import {
+  BoardsFilterRenderer,
+  LibraryFilterRenderer,
+} from './widgets/component-list/filter-renderer';
+import { CheckForUpdates } from './contributions/check-for-updates';
+import { OutputEditorFactory } from './theia/output/output-editor-factory';
+import { StartupTaskProvider } from '../electron-common/startup-task';
+import { DeleteSketch } from './contributions/delete-sketch';
+import { UserFields } from './contributions/user-fields';
+import { UpdateIndexes } from './contributions/update-indexes';
+import { InterfaceScale } from './contributions/interface-scale';
+import { OpenHandler } from '@theia/core/lib/browser/opener-service';
+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 {
+  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';
+import { TypeHierarchyContribution } from './theia/typehierarchy/type-hierarchy-contribution';
+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 { ConfigServiceClient } from './config/config-service-client';
+import { ValidateSketch } from './contributions/validate-sketch';
+import { RenameCloudSketch } from './contributions/rename-cloud-sketch';
+import { CreateFeatures } from './create/create-features';
+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';
 
-const registerArduinoThemes = () => {
-  const themes: MonacoThemeJson[] = [
-    {
-      id: 'arduino-theme',
-      label: 'Light (Arduino)',
-      uiTheme: 'vs',
-      json: require('../../src/browser/data/default.color-theme.json'),
-    },
-    {
-      id: 'arduino-theme-dark',
-      label: 'Dark (Arduino)',
-      uiTheme: 'vs-dark',
-      json: require('../../src/browser/data/dark.color-theme.json'),
-    },
-  ];
-  themes.forEach((theme) => MonacoThemingService.register(theme));
-};
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const global = window as any;
-const ready = global[MonacoThemeServiceIsReady] as Deferred;
-if (ready) {
-  ready.promise.then(registerArduinoThemes);
-} else {
-  registerArduinoThemes();
-}
+import {
+  VersionWelcomeDialog,
+  VersionWelcomeDialogProps,
+} from './dialogs/version-welcome-dialog';
+import { TestViewContribution as TheiaTestViewContribution } from '@theia/test/lib/browser/view/test-view-contribution';
+import { TestViewContribution } from './theia/test/test-view-contribution';
+
+// 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);
 
   // Renderer for both the library and the core widgets.
   bind(ListItemRenderer).toSelf().inSingletonScope();
+  bind(LibraryFilterRenderer).toSelf().inSingletonScope();
+  bind(BoardsFilterRenderer).toSelf().inSingletonScope();
 
   // Library service
   bind(LibraryService)
@@ -383,6 +423,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(FrontendApplicationContribution).toService(
     LibraryListWidgetFrontendContribution
   );
+  bind(OpenHandler).toService(LibraryListWidgetFrontendContribution);
 
   // Sketch list service
   bind(SketchesService)
@@ -405,6 +446,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
       )
     )
     .inSingletonScope();
+  bind(ConfigServiceClient).toSelf().inSingletonScope();
+  bind(FrontendApplicationContribution).toService(ConfigServiceClient);
 
   // Boards service
   bind(BoardsService)
@@ -418,13 +461,15 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   // Boards service client to receive and delegate notifications from the backend.
   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) => {
@@ -448,12 +493,15 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(FrontendApplicationContribution).toService(
     BoardsListWidgetFrontendContribution
   );
+  bind(OpenHandler).toService(BoardsListWidgetFrontendContribution);
 
   // Board select dialog
-  bind(BoardsConfigDialogWidget).toSelf().inSingletonScope();
   bind(BoardsConfigDialog).toSelf().inSingletonScope();
   bind(BoardsConfigDialogProps).toConstantValue({
-    title: nls.localize('arduino/common/selectBoard', 'Select Board'),
+    title: nls.localize(
+      'arduino/board/boardConfigDialogTitle',
+      'Select Other Board and Port'
+    ),
   });
 
   // Core service
@@ -475,15 +523,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(
@@ -514,15 +554,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     WorkspaceVariableContribution
   );
 
-  bind(SurveyNotificationService)
-    .toDynamicValue((context) => {
-      return ElectronIpcConnectionProvider.createProxy(
-        context.container,
-        SurveyNotificationServicePath
-      );
-    })
-    .inSingletonScope();
-
   // Layout and shell customizations.
   rebind(TheiaOutlineViewContribution)
     .to(OutlineViewContribution)
@@ -563,16 +594,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     .to(WorkspaceDeleteHandler)
     .inSingletonScope();
   rebind(TheiaEditorWidgetFactory).to(EditorWidgetFactory).inSingletonScope();
-  rebind(TabBarToolbarFactory).toFactory(
-    ({ container: parentContainer }) =>
-      () => {
-        const container = parentContainer.createChild();
-        container.bind(TabBarToolbar).toSelf().inSingletonScope();
-        return container.get(TabBarToolbar);
-      }
-  );
-  bind(OutputWidget).toSelf().inSingletonScope();
-  rebind(TheiaOutputWidget).toService(OutputWidget);
   bind(OutputChannelManager).toSelf().inSingletonScope();
   rebind(TheiaOutputChannelManager).toService(OutputChannelManager);
   bind(OutputChannelRegistryMainImpl).toSelf().inTransientScope();
@@ -584,9 +605,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(MonacoEditorProvider).toSelf().inSingletonScope();
   rebind(TheiaMonacoEditorProvider).toService(MonacoEditorProvider);
 
-  bind(SearchInWorkspaceWidget).toSelf();
-  rebind(TheiaSearchInWorkspaceWidget).toService(SearchInWorkspaceWidget);
-
   // Disabled reference counter in the editor manager to avoid opening the same editor (with different opener options) multiple times.
   bind(EditorManager).toSelf().inSingletonScope();
   rebind(TheiaEditorManager).toService(EditorManager);
@@ -596,17 +614,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     .to(SearchInWorkspaceFactory)
     .inSingletonScope();
 
-  rebind(TheiaSearchInWorkspaceResultTreeWidget).toDynamicValue(
-    ({ container }) => {
-      const childContainer = createTreeContainer(container);
-      childContainer.bind(SearchInWorkspaceResultTreeWidget).toSelf();
-      childContainer
-        .rebind(TreeWidget)
-        .toService(SearchInWorkspaceResultTreeWidget);
-      return childContainer.get(SearchInWorkspaceResultTreeWidget);
-    }
-  );
-
   // Show a disconnected status bar, when the daemon is not available
   bind(ApplicationConnectionStatusContribution).toSelf().inSingletonScope();
   rebind(TheiaApplicationConnectionStatusContribution).toService(
@@ -637,6 +644,15 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(WindowContribution).toSelf().inSingletonScope();
   rebind(TheiaWindowContribution).toService(WindowContribution);
 
+  // To remove `File` > `Close Editor`.
+  bind(EditorMenuContribution).toSelf().inSingletonScope();
+  rebind(TheiaEditorMenuContribution).toService(EditorMenuContribution);
+
+  // To disable the highlighting of non-unicode characters in the _Output_ view
+  bind(OutputEditorFactory).toSelf().inSingletonScope();
+  // Rebind to `TheiaOutputEditorFactory` when https://github.com/eclipse-theia/theia/pull/11615 is available.
+  rebind(MonacoEditorFactory).toService(OutputEditorFactory);
+
   bind(ArduinoDaemon)
     .toDynamicValue((context) =>
       WebSocketConnectionProvider.createProxy(
@@ -702,7 +718,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, EditContributions);
   Contribution.configure(bind, QuitApp);
   Contribution.configure(bind, SketchControl);
-  Contribution.configure(bind, Settings);
+  Contribution.configure(bind, OpenSettings);
   Contribution.configure(bind, BurnBootloader);
   Contribution.configure(bind, BuiltInExamples);
   Contribution.configure(bind, LibraryExamples);
@@ -721,16 +737,37 @@ 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);
   Contribution.configure(bind, OpenSketchFiles);
   Contribution.configure(bind, InoLanguage);
   Contribution.configure(bind, SelectedBoard);
-  Contribution.configure(bind, CheckForUpdates);
+  Contribution.configure(bind, CheckForIDEUpdates);
   Contribution.configure(bind, OpenBoardsConfig);
   Contribution.configure(bind, SketchFilesTracker);
+  Contribution.configure(bind, CheckForUpdates);
+  Contribution.configure(bind, UserFields);
+  Contribution.configure(bind, DeleteSketch);
+  Contribution.configure(bind, UpdateIndexes);
+  Contribution.configure(bind, InterfaceScale);
+  Contribution.configure(bind, NewCloudSketch);
+  Contribution.configure(bind, ValidateSketch);
+  Contribution.configure(bind, RenameCloudSketch);
+  Contribution.configure(bind, Account);
+  Contribution.configure(bind, CloudSketchbookContribution);
+  Contribution.configure(bind, CreateCloudCopy);
+  Contribution.configure(bind, UpdateArduinoState);
+  Contribution.configure(bind, BoardsDataMenuUpdater);
+  Contribution.configure(bind, AutoSelectProgrammer);
+
+  bind(CompileSummaryProvider).toService(VerifySketch);
+
+  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.
@@ -774,20 +811,22 @@ 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
     );
   });
 
-  // Workaround for https://github.com/eclipse-theia/theia/issues/8722
-  // Do not trigger a save on IDE startup if `"editor.autoSave": "on"` was set as a preference.
-  // Note: `"editor.autoSave" was renamed to `"files.autoSave" and `"on"` was replaced with three
-  // different cases, but we treat `!== 'off'` as auto save enabled. (https://github.com/eclipse-theia/theia/issues/10812)
-  bind(EditorCommandContribution).toSelf().inSingletonScope();
-  rebind(TheiaEditorCommandContribution).toService(EditorCommandContribution);
-
   // Silent the badge decoration in the Explorer view.
   bind(NavigatorTabBarDecorator).toSelf().inSingletonScope();
   rebind(TheiaNavigatorTabBarDecorator).toService(NavigatorTabBarDecorator);
@@ -812,9 +851,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(AboutDialog).toSelf().inSingletonScope();
   rebind(TheiaAboutDialog).toService(AboutDialog);
 
-  // To avoid running `Save All` when there are no dirty editors before starting the debug session.
-  bind(DebugSessionManager).toSelf().inSingletonScope();
-  rebind(TheiaDebugSessionManager).toService(DebugSessionManager);
   // To remove the `Run` menu item from the application menu.
   bind(DebugFrontendApplicationContribution).toSelf().inSingletonScope();
   rebind(TheiaDebugFrontendApplicationContribution).toService(
@@ -823,19 +859,49 @@ 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();
   rebind(TheiaWidgetManager).toService(WidgetManager);
 
-  // To avoid running a status bar update on every single `keypress` event from the editor.
-  bind(StatusBarImpl).toSelf().inSingletonScope();
-  rebind(TheiaStatusBarImpl).toService(StatusBarImpl);
-
   // Debounced update for the tab-bar toolbar when typing in the editor.
   bind(DockPanelRenderer).toSelf();
   rebind(TheiaDockPanelRenderer).toService(DockPanelRenderer);
 
+  // Avoid running the "reset scroll" interval tasks until the preference editor opens.
+  rebind(PreferencesWidget)
+    .toDynamicValue(({ container }) => {
+      const child = createPreferencesWidgetContainer(container);
+      child.bind(PreferencesEditorWidget).toSelf().inSingletonScope();
+      child
+        .rebind(TheiaPreferencesEditorWidget)
+        .toService(PreferencesEditorWidget);
+      return child.get(PreferencesWidget);
+    })
+    .inSingletonScope();
+
   // Preferences
   bindArduinoPreferences(bind);
 
@@ -851,9 +917,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();
@@ -870,6 +933,11 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     id: 'arduino-sketchbook-widget',
     createWidget: () => container.get(SketchbookWidget),
   }));
+  bind(SketchbookCompositeWidget).toSelf();
+  bind<WidgetFactory>(WidgetFactory).toDynamicValue((ctx) => ({
+    id: 'sketchbook-composite-widget',
+    createWidget: () => ctx.container.get(SketchbookCompositeWidget),
+  }));
 
   bind(CloudSketchbookWidget).toSelf();
   rebind(SketchbookWidget).toService(CloudSketchbookWidget);
@@ -878,6 +946,8 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   );
   bind(CreateApi).toSelf().inSingletonScope();
   bind(SketchCache).toSelf().inSingletonScope();
+  bind(CreateFeatures).toSelf().inSingletonScope();
+  bind(FrontendApplicationContribution).toService(CreateFeatures);
 
   bind(ShareSketchDialog).toSelf().inSingletonScope();
   bind(AuthenticationClientService).toSelf().inSingletonScope();
@@ -894,17 +964,14 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(CreateFsProvider).toSelf().inSingletonScope();
   bind(FrontendApplicationContribution).toService(CreateFsProvider);
   bind(FileServiceContribution).toService(CreateFsProvider);
-  bind(CloudSketchbookContribution).toSelf().inSingletonScope();
-  bind(CommandContribution).toService(CloudSketchbookContribution);
   bind(LocalCacheFsProvider).toSelf().inSingletonScope();
   bind(FileServiceContribution).toService(LocalCacheFsProvider);
   bind(CloudSketchbookCompositeWidget).toSelf();
-  bind<WidgetFactory>(WidgetFactory).toDynamicValue((ctx) => ({
+  bind(WidgetFactory).toDynamicValue((ctx) => ({
     id: 'cloud-sketchbook-composite-widget',
     createWidget: () => ctx.container.get(CloudSketchbookCompositeWidget),
   }));
 
-  bind(UploadFirmwareDialogWidget).toSelf().inSingletonScope();
   bind(UploadFirmwareDialog).toSelf().inSingletonScope();
   bind(UploadFirmwareDialogProps).toConstantValue({
     title: 'UploadFirmware',
@@ -915,13 +982,16 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     title: 'UploadCertificate',
   });
 
-  bind(IDEUpdaterDialogWidget).toSelf().inSingletonScope();
   bind(IDEUpdaterDialog).toSelf().inSingletonScope();
   bind(IDEUpdaterDialogProps).toConstantValue({
     title: 'IDEUpdater',
   });
 
-  bind(UserFieldsDialogWidget).toSelf().inSingletonScope();
+  bind(VersionWelcomeDialog).toSelf().inSingletonScope();
+  bind(VersionWelcomeDialogProps).toConstantValue({
+    title: 'VersionWelcomeDialog',
+  });
+
   bind(UserFieldsDialog).toSelf().inSingletonScope();
   bind(UserFieldsDialogProps).toConstantValue({
     title: 'UserFields',
@@ -944,8 +1014,69 @@ 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);
+
+  // custom window titles
+  bind(WindowTitleUpdater).toSelf().inSingletonScope();
+  rebind(TheiaWindowTitleUpdater).toService(WindowTitleUpdater);
+
+  // register Arduino themes
+  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();
+  rebind(TheiaTypeHierarchyServiceProvider).toService(
+    TypeHierarchyServiceProvider
+  );
+  bind(TypeHierarchyContribution).toSelf().inSingletonScope();
+  rebind(TheiaTypeHierarchyContribution).toService(TypeHierarchyContribution);
+
+  bind(DefaultDebugSessionFactory).toSelf().inSingletonScope();
+  rebind(DebugSessionFactory).toService(DefaultDebugSessionFactory);
+
+  bind(SidebarBottomMenuWidget).toSelf();
+  rebind(TheiaSidebarBottomMenuWidget).toService(SidebarBottomMenuWidget);
+
+  bind(ArduinoComponentContextMenuRenderer).toSelf().inSingletonScope();
+
+  bind(DaemonPort).toSelf().inSingletonScope();
+  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
+  );
+
+  // Hides the Test Explorer from the side-bar
+  bind(TestViewContribution).toSelf().inSingletonScope();
+  rebind(TheiaTestViewContribution).toService(TestViewContribution);
 });

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,221 +43,296 @@ export namespace ErrorRevealStrategy {
   export const Default: ErrorRevealStrategy = 'centerIfOutsideViewport';
 }
 
+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(
+      'arduino/preferences/language.log',
+      "True if the Arduino Language Server should generate log files into the sketch folder. Otherwise, false. It's false by default."
+    ),
+    default: false,
+  },
+  'arduino.language.realTimeDiagnostics': {
+    type: 'boolean',
+    description: nls.localize(
+      'arduino/preferences/language.realTimeDiagnostics',
+      "If true, the language server provides real-time diagnostics when typing in the editor. It's false by default."
+    ),
+    default: false,
+  },
+  'arduino.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(
+      'arduino/preferences/compile.verbose',
+      'True for verbose compile output. False by default'
+    ),
+    default: false,
+  },
+  'arduino.compile.experimental': {
+    type: 'boolean',
+    description: nls.localize(
+      'arduino/preferences/compile.experimental',
+      'True if the IDE should handle multiple compiler errors. False by default'
+    ),
+    default: false,
+  },
+  'arduino.compile.revealRange': {
+    enum: [...ErrorRevealStrategyLiterals],
+    description: nls.localize(
+      'arduino/preferences/compile.revealRange',
+      "Adjusts how compiler errors are revealed in the editor after a failed verify/upload. Possible values: 'auto': Scroll vertically as necessary and reveal a line. 'center': Scroll vertically as necessary and reveal a line centered vertically. 'top': Scroll vertically as necessary and reveal a line close to the top of the viewport, optimized for viewing a code definition. 'centerIfOutsideViewport': Scroll vertically as necessary and reveal a line centered vertically only if it lies outside the viewport. The default value is '{0}'.",
+      ErrorRevealStrategy.Default
+    ),
+    default: ErrorRevealStrategy.Default,
+  },
+  'arduino.compile.warnings': {
+    enum: [...CompilerWarningLiterals],
+    description: nls.localize(
+      'arduino/preferences/compile.warnings',
+      "Tells gcc which warning level to use. It's 'None' by default"
+    ),
+    default: 'None',
+  },
+  'arduino.upload.verbose': {
+    type: 'boolean',
+    description: nls.localize(
+      'arduino/preferences/upload.verbose',
+      'True for verbose upload output. False by default.'
+    ),
+    default: false,
+  },
+  'arduino.upload.verify': {
+    type: 'boolean',
+    default: false,
+    description: nls.localize(
+      'arduino/preferences/upload.verify',
+      'After upload, verify that the contents of the memory on the board match the uploaded binary.'
+    ),
+  },
+  'arduino.upload.autoVerify': {
+    type: 'boolean',
+    default: true,
+    description: nls.localize(
+      'arduino/preferences/upload.autoVerify',
+      "True if the IDE should automatically verify the code before the upload. True by default. When this value is false, IDE does not recompile the code before uploading the binary to the board. It's highly advised to only set this value to false if you know what you are doing."
+    ),
+  },
+  'arduino.window.autoScale': {
+    type: 'boolean',
+    description: nls.localize(
+      'arduino/preferences/window.autoScale',
+      'True if the user interface automatically scales with the font size.'
+    ),
+    default: true,
+  },
+  'arduino.window.zoomLevel': {
+    type: 'number',
+    description: '',
+    default: 0,
+    deprecationMessage: nls.localize(
+      'arduino/preferences/window.zoomLevel/deprecationMessage',
+      "Deprecated. Use 'window.zoomLevel' instead."
+    ),
+  },
+  'arduino.ide.updateChannel': {
+    type: 'string',
+    enum: Object.values(UpdateChannel) as UpdateChannel[],
+    default: UpdateChannel.Stable,
+    description: nls.localize(
+      'arduino/preferences/ide.updateChannel',
+      "Release channel to get updated from. 'stable' is the stable release, 'nightly' is the latest development build."
+    ),
+  },
+  'arduino.ide.updateBaseUrl': {
+    type: 'string',
+    default: 'https://downloads.arduino.cc/arduino-ide',
+    description: nls.localize(
+      'arduino/preferences/ide.updateBaseUrl',
+      "The base URL where to download updates from. Defaults to 'https://downloads.arduino.cc/arduino-ide'"
+    ),
+  },
+  'arduino.board.certificates': {
+    type: 'string',
+    description: nls.localize(
+      'arduino/preferences/board.certificates',
+      'List of certificates that can be uploaded to boards'
+    ),
+    default: '',
+  },
+  'arduino.sketchbook.showAllFiles': {
+    type: 'boolean',
+    description: nls.localize(
+      'arduino/preferences/sketchbook.showAllFiles',
+      'True to show all sketch files inside the sketch. It is false by default.'
+    ),
+    default: false,
+  },
+  'arduino.cloud.enabled': {
+    type: 'boolean',
+    description: nls.localize(
+      'arduino/preferences/cloud.enabled',
+      'True if the sketch sync functions are enabled. Defaults to true.'
+    ),
+    default: true,
+  },
+  'arduino.cloud.pull.warn': {
+    type: 'boolean',
+    description: nls.localize(
+      'arduino/preferences/cloud.pull.warn',
+      'True if users should be warned before pulling a cloud sketch. Defaults to true.'
+    ),
+    default: true,
+  },
+  'arduino.cloud.push.warn': {
+    type: 'boolean',
+    description: nls.localize(
+      'arduino/preferences/cloud.push.warn',
+      'True if users should be warned before pushing a cloud sketch. Defaults to true.'
+    ),
+    default: true,
+  },
+  'arduino.cloud.pushpublic.warn': {
+    type: 'boolean',
+    description: nls.localize(
+      'arduino/preferences/cloud.pushpublic.warn',
+      'True if users should be warned before pushing a public sketch to the cloud. Defaults to true.'
+    ),
+    default: true,
+  },
+  'arduino.cloud.sketchSyncEndpoint': {
+    type: 'string',
+    description: nls.localize(
+      'arduino/preferences/cloud.sketchSyncEndpoint',
+      'The endpoint used to push and pull sketches from a backend. By default it points to Arduino Cloud API.'
+    ),
+    default: 'https://api2.arduino.cc/create',
+  },
+  'arduino.cloud.sharedSpaceID': {
+    type: 'string',
+    description: nls.localize(
+      'arduino/preferences/cloud.sharedSpaceId',
+      'The ID of the Arduino Cloud shared space to load the sketchbook from. If empty, your private space is selected.'
+    ),
+    default: '',
+  },
+  'arduino.auth.clientID': {
+    type: 'string',
+    description: nls.localize(
+      'arduino/preferences/auth.clientID',
+      'The OAuth2 client ID.'
+    ),
+    default: 'C34Ya6ex77jTNxyKWj01lCe1vAHIaPIo',
+  },
+  'arduino.auth.domain': {
+    type: 'string',
+    description: nls.localize(
+      'arduino/preferences/auth.domain',
+      'The OAuth2 domain.'
+    ),
+    default: 'login.arduino.cc',
+  },
+  'arduino.auth.audience': {
+    type: 'string',
+    description: nls.localize(
+      'arduino/preferences/auth.audience',
+      'The OAuth2 audience.'
+    ),
+    default: 'https://api.arduino.cc',
+  },
+  'arduino.auth.registerUri': {
+    type: 'string',
+    description: nls.localize(
+      'arduino/preferences/auth.registerUri',
+      'The URI used to register a new user.'
+    ),
+    default: 'https://auth.arduino.cc/login#/register',
+  },
+  'arduino.cli.daemon.debug': {
+    type: 'boolean',
+    description: nls.localize(
+      'arduino/preferences/cli.daemonDebug',
+      "Enable debug logging of the gRPC calls to the Arduino CLI. A restart of the IDE is needed for this setting to take effect. It's false by default."
+    ),
+    default: false,
+  },
+  'arduino.checkForUpdates': {
+    type: 'boolean',
+    description: nls.localize(
+      'arduino/preferences/checkForUpdate',
+      "Receive notifications of available updates for the IDE, boards, and libraries. Requires an IDE restart after change. It's true by default."
+    ),
+    default: true,
+  },
+  'arduino.sketch.inoBlueprint': {
+    type: 'string',
+    markdownDescription: nls.localize(
+      'arduino/preferences/sketch/inoBlueprint',
+      'Absolute filesystem path to the default `.ino` blueprint file. If specified, the content of the blueprint file will be used for every new sketch created by the IDE. The sketches will be generated with the default Arduino content if not specified. Unaccessible blueprint files are ignored. **A restart of the IDE is needed** for this setting to take effect.'
+    ),
+    default: undefined,
+  },
+  '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: {
-    'arduino.language.log': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/language.log',
-        "True if the Arduino Language Server should generate log files into the sketch folder. Otherwise, false. It's false by default."
-      ),
-      default: false,
-    },
-    'arduino.language.realTimeDiagnostics': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/language.realTimeDiagnostics',
-        "If true, the language server provides real-time diagnostics when typing in the editor. It's false by default."
-      ),
-      default: false,
-    },
-    'arduino.compile.verbose': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/compile.verbose',
-        'True for verbose compile output. False by default'
-      ),
-      default: false,
-    },
-    'arduino.compile.experimental': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/compile.experimental',
-        'True if the IDE should handle multiple compiler errors. False by default'
-      ),
-      default: false,
-    },
-    'arduino.compile.revealRange': {
-      enum: [...ErrorRevealStrategyLiterals],
-      description: nls.localize(
-        'arduino/preferences/compile.revealRange',
-        "Adjusts how compiler errors are revealed in the editor after a failed verify/upload. Possible values: 'auto': Scroll vertically as necessary and reveal a line. 'center': Scroll vertically as necessary and reveal a line centered vertically. 'top': Scroll vertically as necessary and reveal a line close to the top of the viewport, optimized for viewing a code definition. 'centerIfOutsideViewport': Scroll vertically as necessary and reveal a line centered vertically only if it lies outside the viewport. The default value is '{0}'.",
-        ErrorRevealStrategy.Default
-      ),
-      default: ErrorRevealStrategy.Default,
-    },
-    'arduino.compile.warnings': {
-      enum: [...CompilerWarningLiterals],
-      description: nls.localize(
-        'arduino/preferences/compile.warnings',
-        "Tells gcc which warning level to use. It's 'None' by default"
-      ),
-      default: 'None',
-    },
-    'arduino.upload.verbose': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/upload.verbose',
-        'True for verbose upload output. False by default.'
-      ),
-      default: false,
-    },
-    'arduino.upload.verify': {
-      type: 'boolean',
-      default: false,
-    },
-    'arduino.window.autoScale': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/window.autoScale',
-        'True if the user interface automatically scales with the font size.'
-      ),
-      default: true,
-    },
-    'arduino.window.zoomLevel': {
-      type: 'number',
-      description: nls.localize(
-        'arduino/preferences/window.zoomLevel',
-        'Adjust the zoom level of the window. The original size is 0 and each increment above (e.g. 1) or below (e.g. -1) represents zooming 20% larger or smaller. You can also enter decimals to adjust the zoom level with a finer granularity.'
-      ),
-      default: 0,
-    },
-    'arduino.ide.updateChannel': {
-      type: 'string',
-      enum: Object.values(UpdateChannel) as UpdateChannel[],
-      default: UpdateChannel.Stable,
-      description: nls.localize(
-        'arduino/preferences/ide.updateChannel',
-        "Release channel to get updated from. 'stable' is the stable release, 'nightly' is the latest development build."
-      ),
-    },
-    'arduino.ide.updateBaseUrl': {
-      type: 'string',
-      default: 'https://downloads.arduino.cc/arduino-ide',
-      description: nls.localize(
-        'arduino/preferences/ide.updateBaseUrl',
-        "The base URL where to download updates from. Defaults to 'https://downloads.arduino.cc/arduino-ide'"
-      ),
-    },
-    'arduino.board.certificates': {
-      type: 'string',
-      description: nls.localize(
-        'arduino/preferences/board.certificates',
-        'List of certificates that can be uploaded to boards'
-      ),
-      default: '',
-    },
-    'arduino.sketchbook.showAllFiles': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/sketchbook.showAllFiles',
-        'True to show all sketch files inside the sketch. It is false by default.'
-      ),
-      default: false,
-    },
-    'arduino.cloud.enabled': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/cloud.enabled',
-        'True if the sketch sync functions are enabled. Defaults to true.'
-      ),
-      default: true,
-    },
-    'arduino.cloud.pull.warn': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/cloud.pull.warn',
-        'True if users should be warned before pulling a cloud sketch. Defaults to true.'
-      ),
-      default: true,
-    },
-    'arduino.cloud.push.warn': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/cloud.push.warn',
-        'True if users should be warned before pushing a cloud sketch. Defaults to true.'
-      ),
-      default: true,
-    },
-    'arduino.cloud.pushpublic.warn': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/cloud.pushpublic.warn',
-        'True if users should be warned before pushing a public sketch to the cloud. Defaults to true.'
-      ),
-      default: true,
-    },
-    'arduino.cloud.sketchSyncEndpoint': {
-      type: 'string',
-      description: nls.localize(
-        'arduino/preferences/cloud.sketchSyncEndpoint',
-        'The endpoint used to push and pull sketches from a backend. By default it points to Arduino Cloud API.'
-      ),
-      default: 'https://api2.arduino.cc/create',
-    },
-    'arduino.auth.clientID': {
-      type: 'string',
-      description: nls.localize(
-        'arduino/preferences/auth.clientID',
-        'The OAuth2 client ID.'
-      ),
-      default: 'C34Ya6ex77jTNxyKWj01lCe1vAHIaPIo',
-    },
-    'arduino.auth.domain': {
-      type: 'string',
-      description: nls.localize(
-        'arduino/preferences/auth.domain',
-        'The OAuth2 domain.'
-      ),
-      default: 'login.arduino.cc',
-    },
-    'arduino.auth.audience': {
-      type: 'string',
-      description: nls.localize(
-        'arduino/preferences/auth.audience',
-        'The OAuth2 audience.'
-      ),
-      default: 'https://api.arduino.cc',
-    },
-    'arduino.auth.registerUri': {
-      type: 'string',
-      description: nls.localize(
-        'arduino/preferences/auth.registerUri',
-        'The URI used to register a new user.'
-      ),
-      default: 'https://auth.arduino.cc/login#/register',
-    },
-    'arduino.survey.notification': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/survey.notification',
-        'True if users should be notified if a survey is available. True by default.'
-      ),
-      default: true,
-    },
-    'arduino.cli.daemon.debug': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/cli.daemonDebug',
-        "Enable debug logging of the gRPC calls to the Arduino CLI. A restart of the IDE is needed for this setting to take effect. It's false by default."
-      ),
-      default: false,
-    },
-  },
+  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;
   'arduino.compile.warnings': CompilerWarnings;
   'arduino.upload.verbose': boolean;
   'arduino.upload.verify': boolean;
+  'arduino.upload.autoVerify': boolean;
   'arduino.window.autoScale': boolean;
-  'arduino.window.zoomLevel': number;
   'arduino.ide.updateChannel': UpdateChannel;
   'arduino.ide.updateBaseUrl': string;
   'arduino.board.certificates': string;
@@ -264,12 +342,15 @@ export interface ArduinoConfiguration {
   'arduino.cloud.push.warn': boolean;
   'arduino.cloud.pushpublic.warn': boolean;
   'arduino.cloud.sketchSyncEndpoint': string;
+  'arduino.cloud.sharedSpaceID': string;
   'arduino.auth.clientID': string;
   'arduino.auth.domain': string;
   'arduino.auth.audience': string;
   'arduino.auth.registerUri': string;
-  'arduino.survey.notification': boolean;
   'arduino.cli.daemon.debug': boolean;
+  'arduino.sketch.inoBlueprint': string;
+  'arduino.checkForUpdates': boolean;
+  'arduino.monitor.dockPanel': MonitorWidgetDockPanel;
 }
 
 export const ArduinoPreferences = Symbol('ArduinoPreferences');

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

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

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

@@ -3,19 +3,19 @@ import { Emitter } from '@theia/core/lib/common/event';
 import { JsonRpcProxy } from '@theia/core/lib/common/messaging/proxy-factory';
 import { WindowService } from '@theia/core/lib/browser/window/window-service';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
 import {
   CommandRegistry,
   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'],
@@ -83,9 +83,13 @@ export class AuthenticationClientService
   registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(CloudUserCommands.LOGIN, {
       execute: () => this.service.login(),
+      isEnabled: () => !this._session,
+      isVisible: () => !this._session,
     });
     registry.registerCommand(CloudUserCommands.LOGOUT, {
       execute: () => this.service.logout(),
+      isEnabled: () => !!this._session,
+      isVisible: () => !!this._session,
     });
   }
 

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

@@ -1,5 +1,8 @@
 import { Command } from '@theia/core/lib/common/command';
 
+export const LEARN_MORE_URL =
+  'https://docs.arduino.cc/software/ide-v2/tutorials/ide-v2-cloud-sketch-sync';
+
 export namespace CloudUserCommands {
   export const LOGIN = Command.toLocalizedCommand(
     {
@@ -16,9 +19,4 @@ export namespace CloudUserCommands {
     },
     'arduino/cloud/signOut'
   );
-
-  export const OPEN_PROFILE_CONTEXT_MENU: Command = {
-    id: 'arduino-cloud-sketchbook--open-profile-menu',
-    label: 'Contextual menu',
-  };
 }

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

@@ -1,281 +1,229 @@
-import { injectable, inject } from '@theia/core/shared/inversify';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
 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 { 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';
 import { Installable, ResponseServiceClient } from '../../common/protocol';
-import { BoardsListWidgetFrontendContribution } from './boards-widget-frontend-contribution';
-import { nls } from '@theia/core/lib/common';
+import {
+  BoardIdentifier,
+  BoardsPackage,
+  BoardsService,
+  createPlatformIdentifier,
+  isBoardIdentifierChangeEvent,
+  PlatformIdentifier,
+  platformIdentifierEquals,
+  serializePlatformIdentifier,
+} from '../../common/protocol/boards-service';
 import { NotificationCenter } from '../notification-center';
-
-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 { 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;
-
-        const boardWasUnplugged =
-          !selectedPort && this.portSelectedOnLastRefusal;
-
-        this.clearLastRefusedPromptInfo();
-
-        if (
-          boardWasUnplugged ||
-          !selectedBoard ||
-          this.promptAlreadyShowingForBoard(selectedBoard)
-        ) {
-          return;
+    this.toDispose.pushAll([
+      this.boardsServiceProvider.onBoardsConfigDidChange((event) => {
+        if (isBoardIdentifierChangeEvent(event)) {
+          this.ensureCoreExists(event.selectedBoard);
         }
-
-        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();
+      }),
+      this.notificationCenter.onPlatformDidInstall((event) =>
+        this.clearAllNotificationForPlatform(event.item.id)
+      ),
+    ]);
+    this.boardsServiceProvider.ready.then(() => {
+      const { selectedBoard } = this.boardsServiceProvider.boardsConfig;
+      this.ensureCoreExists(selectedBoard);
     });
   }
 
-  private removeNotificationByBoard(selectedBoard: Board): void {
-    const index = this.notifications.findIndex((notification) =>
-      Board.sameAs(notification, selectedBoard)
-    );
-    if (index !== -1) {
-      this.notifications.splice(index, 1);
+  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 clearLastRefusedPromptInfo(): void {
-    this.lastRefusedPackageId = undefined;
-    this.portSelectedOnLastRefusal = undefined;
-  }
-
-  private setLastRefusedPromptInfo(
-    packageId: string,
-    selectedPort?: Port
-  ): void {
-    this.lastRefusedPackageId = packageId;
-    this.portSelectedOnLastRefusal = selectedPort;
-  }
-
-  private promptAlreadyShowingForBoard(board: Board): boolean {
-    return Boolean(
-      this.notifications.find((notification) =>
-        Board.sameAs(notification, board)
-      )
-    );
-  }
-
-  protected ensureCoreExists(selectedBoard: Board, selectedPort?: Port): void {
-    this.notifications.push(selectedBoard);
-    this.boardsService.search({}).then((packages) => {
-      const candidate = this.getInstallCandidate(packages, selectedBoard);
-
-      if (candidate) {
-        this.showAutoInstallPrompt(candidate, selectedBoard, selectedPort);
-      } else {
-        this.removeNotificationByBoard(selectedBoard);
+  private 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 (
+        installedPlatformIds.every(
+          (installedPlatformId) =>
+            !platformIdentifierEquals(
+              installedPlatformId,
+              selectedBoardPlatformId
+            )
+        )
+      ) {
+        return selectedBoardPlatformId;
       }
-    });
+    } else {
+      // 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;
     }
+    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);
 
-    // filter the installable (not installed) packages,
-    // CLI returns the packages already sorted with the deprecated ones at the end of the list
-    // in order to ensure the new ones are preferred
-    const candidates = packagesForBoard.filter(
-      ({ installable, installedVersion }) => installable && !installedVersion
-    );
-
-    return candidates[0];
-  }
-
-  private showAutoInstallPrompt(
-    candidate: BoardsPackage,
-    selectedBoard: Board,
-    selectedPort?: Port
-  ): void {
-    const candidateName = candidate.name;
     const version = candidate.availableVersions[0]
       ? `[v ${candidate.availableVersions[0]}]`
       : '';
-
-    const info = this.generatePromptInfoText(
-      candidateName,
+    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
     );
-  }
-
-  private createPromptActions(
-    candidate: BoardsPackage
-  ): AutoInstallPromptActions {
-    const yes = nls.localize('vscode/extensionsUtils/yes', 'Yes');
-    const manualInstall = nls.localize(
-      'arduino/board/installManually',
-      'Install Manually'
-    );
-
-    const actions: AutoInstallPromptActions = [
-      {
-        key: manualInstall,
-        handler: () => {
-          this.boardsManagerFrontendContribution
-            .openView({ reveal: true })
-            .then((widget) =>
-              widget.refresh(candidate.name.toLocaleLowerCase())
-            );
-        },
-      },
-      {
-        isAcceptance: true,
-        key: yes,
-        handler: () => {
-          return Installable.installWithProgress({
-            installable: this.boardsService,
-            item: candidate,
-            messageService: this.messageService,
-            responseService: this.responseService,
-            version: candidate.availableVersions[0],
-          });
-        },
-      },
-    ];
-
-    return actions;
-  }
-
-  private createOnAnswerHandler(
-    actions: AutoInstallPromptActions,
-    onRefuse?: () => void
-  ): (answer: string) => void {
-    return (answer) => {
-      const actionToHandle = actions.find((action) => action.key === answer);
-      actionToHandle?.handler();
-
-      if (!actionToHandle?.isAcceptance && onRefuse) {
-        onRefuse();
+    if (answer) {
+      const index = this.installNotificationInfos.findIndex(
+        ({ boardName, platformId }) =>
+          platformIdToInstall === platformId && selectedBoardName === boardName
+      );
+      if (index !== -1) {
+        this.installNotificationInfos.splice(index, 1);
       }
-    };
+      if (answer === yes) {
+        await Installable.installWithProgress({
+          installable: this.boardsService,
+          item: candidate,
+          messageService: this.messageService,
+          responseService: this.responseService,
+          version: candidate.availableVersions[0],
+        });
+        return;
+      }
+      if (answer === InstallManually) {
+        this.boardsManagerWidgetContribution
+          .openView({ reveal: true })
+          .then((widget) =>
+            widget.refresh({
+              query: candidate.name.toLocaleLowerCase(),
+              type: 'All',
+            })
+          );
+      }
+    }
+  }
+
+  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,
+    });
   }
 }

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,145 +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);
-
-    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 title = document.createElement('div');
-    title.textContent = nls.localize(
-      'arduino/board/configDialogTitle',
-      'Select Other Board & Port'
-    );
-    title.classList.add('title');
-    head.appendChild(title);
-
-    const text = document.createElement('div');
-    text.classList.add('text');
-    head.appendChild(text);
-
-    for (const paragraph of [
-      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,203 @@
+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(
+    disposeOnResolve = true,
+    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(disposeOnResolve);
+  }
+
+  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,470 +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,
-  AttachedBoardsChangeEvent,
-  BoardWithPackage,
-} from '../../common/protocol/boards-service';
-import { NotificationCenter } from '../notification-center';
-import {
-  AvailableBoard,
-  BoardsServiceProvider,
-} from './boards-service-provider';
-import { naturalCompare } from '../../common/utils';
-import { nls } from '@theia/core/lib/common';
-import { FrontendApplicationState } from '@theia/core/lib/common/frontend-application-state';
-
-export namespace BoardsConfig {
-  export interface Config {
-    selectedBoard?: Board;
-    selectedPort?: Port;
-  }
-
-  export interface 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.notificationCenter.onAttachedBoardsDidChange((event) =>
-        this.updatePorts(
-          event.newState.ports,
-          AttachedBoardsChangeEvent.diff(event).detached.ports
-        )
-      ),
-      this.props.boardsServiceProvider.onBoardsConfigChanged(
-        ({ selectedBoard, selectedPort }) => {
-          this.setState({ selectedBoard, selectedPort }, () =>
-            this.fireConfigChanged()
-          );
-        }
-      ),
-      this.props.notificationCenter.onPlatformDidInstall(() =>
-        this.updateBoards(this.state.query)
-      ),
-      this.props.notificationCenter.onPlatformDidUninstall(() =>
-        this.updateBoards(this.state.query)
-      ),
-      this.props.notificationCenter.onIndexDidUpdate(() =>
-        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 (
-      <div className="body">
-        {this.renderContainer('boards', this.renderBoards.bind(this))}
-        {this.renderContainer(
-          'ports',
-          this.renderPorts.bind(this),
-          this.renderPortsFooter.bind(this)
-        )}
-      </div>
-    );
-  }
-
-  protected renderContainer(
-    title: string,
-    contentRenderer: () => React.ReactNode,
-    footerRenderer?: () => React.ReactNode
-  ): React.ReactNode {
-    return (
-      <div className="container">
-        <div className="content">
-          <div className="title">{title}</div>
-          {contentRenderer()}
-          <div className="footer">{footerRenderer ? footerRenderer() : ''}</div>
-        </div>
-      </div>
-    );
-  }
-
-  protected renderBoards(): React.ReactNode {
-    const { selectedBoard, searchResults, query } = this.state;
-    // Board names are not unique per core https://github.com/arduino/arduino-pro-ide/issues/262#issuecomment-661019560
-    // It is tricky when the core is not yet installed, no FQBNs are available.
-    const distinctBoards = new Map<string, Board.Detailed>();
-    const toKey = ({ name, packageName, fqbn }: Board.Detailed) =>
-      !!fqbn ? `${name}-${packageName}-${fqbn}` : `${name}-${packageName}`;
-    for (const board of Board.decorateBoards(selectedBoard, searchResults)) {
-      const key = toKey(board);
-      if (!distinctBoards.has(key)) {
-        distinctBoards.set(key, board);
-      }
-    }
-
-    return (
-      <React.Fragment>
-        <div className="search">
-          <input
-            type="search"
-            value={query}
-            className="theia-input"
-            placeholder="SEARCH BOARD"
-            onChange={this.updateBoards}
-            ref={this.focusNodeSet}
-          />
-          <i className="fa fa-search"></i>
-        </div>
-        <div className="boards list">
-          {Array.from(distinctBoards.values()).map((board) => (
-            <Item<BoardWithPackage>
-              key={toKey(board)}
-              item={board}
-              label={board.name}
-              details={board.details}
-              selected={board.selected}
-              onClick={this.selectBoard}
-              missing={board.missing}
-            />
-          ))}
-        </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) => {
-        if (port.protocol === 'serial') {
-          return true;
-        }
-        // All other ports with different protocol are
-        // only shown if there is a recognized board
-        // connected
-        for (const board of this.availableBoards) {
-          if (board.port?.address === port.address) {
-            return true;
-          }
-        }
-      });
-    }
-    return !ports.length ? (
-      <div className="loading noselect">No ports discovered</div>
-    ) : (
-      <div className="ports list">
-        {ports.map((port) => (
-          <Item<Port>
-            key={`${port.id}`}
-            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>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}` : ''}`;
-    }
-
-    export function setConfig(
-      config: Config | undefined,
-      urlToAttachTo: URL
-    ): URL {
-      const copy = new URL(urlToAttachTo.toString());
-      if (!config) {
-        copy.searchParams.delete('boards-config');
-        return copy;
-      }
-
-      const selectedBoard = config.selectedBoard
-        ? {
-            name: config.selectedBoard.name,
-            fqbn: config.selectedBoard.fqbn,
-          }
-        : undefined;
-      const selectedPort = config.selectedPort
-        ? {
-            protocol: config.selectedPort.protocol,
-            address: config.selectedPort.address,
-          }
-        : undefined;
-      const jsonConfig = JSON.stringify({ selectedBoard, selectedPort });
-      copy.searchParams.set('boards-config', encodeURIComponent(jsonConfig));
-      return copy;
-    }
-
-    export function getConfig(url: URL): Config | undefined {
-      const encoded = url.searchParams.get('boards-config');
-      if (!encoded) {
-        return undefined;
-      }
-      try {
-        const raw = decodeURIComponent(encoded);
-        const candidate = JSON.parse(raw);
-        if (typeof candidate === 'object') {
-          return candidate;
-        }
-        console.warn(
-          `Expected candidate to be an object. It was ${typeof candidate}. URL was: ${url}`
-        );
-        return undefined;
-      } catch (e) {
-        console.log(`Could not get board config from URL: ${url}.`, e);
-        return undefined;
-      }
-    }
-  }
-}

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

@@ -1,77 +1,202 @@
-import { injectable, inject, named } from '@theia/core/shared/inversify';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
+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 { FQBN } from 'fqbn';
 import {
+  BoardDetails,
   BoardsService,
   ConfigOption,
-  BoardDetails,
+  ConfigValue,
   Programmer,
+  isBoardIdentifierChangeEvent,
+  isProgrammer,
+  sanitizeFqbn,
 } 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';
+
+export interface SelectConfigOptionParams {
+  readonly fqbn: string;
+  readonly optionsToUpdate: readonly Readonly<{
+    option: string;
+    selectedValue: string;
+  }>[];
+}
 
 @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<void>();
+  private readonly onDidChangeEmitter =
+    new Emitter<BoardsDataStoreChangeEvent>();
+  private readonly toDispose = new DisposableCollection(
+    this.onDidChangeEmitter
+  );
+  private _selectedBoardData: BoardsDataStoreChange | undefined;
 
   onStart(): void {
-    this.notificationCenter.onPlatformDidInstall(async ({ item }) => {
-      let shouldFireChanged = false;
-      for (const fqbn of item.boards
-        .map(({ fqbn }) => fqbn)
-        .filter(notEmpty)
-        .filter((fqbn) => !!fqbn)) {
-        const key = this.getStorageKey(fqbn);
-        let data = await this.storageService.getData<
-          ConfigOption[] | undefined
-        >(key);
-        if (!data || !data.length) {
-          const details = await this.getBoardDetailsSafe(fqbn);
+    this.toDispose.pushAll([
+      this.boardsServiceProvider.onBoardsConfigDidChange((event) => {
+        if (isBoardIdentifierChangeEvent(event)) {
+          this.updateSelectedBoardData(
+            event.selectedBoard?.fqbn,
+            // If the change event comes from toolbar and the FQBN contains custom board options, change the currently selected options
+            // https://github.com/arduino/arduino-ide/issues/1588
+            event.reason === 'toolbar'
+          );
+        }
+      }),
+      this.notificationCenter.onPlatformDidInstall(async ({ item }) => {
+        const boardsWithFqbn = item.boards
+          .map(({ fqbn }) => fqbn)
+          .filter(notEmpty);
+        const changes: BoardsDataStoreChange[] = [];
+        for (const fqbn of boardsWithFqbn) {
+          const key = this.getStorageKey(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) {
-              await this.storageService.setData(key, data);
-              shouldFireChanged = true;
-            }
+            const data = createDataStoreEntry(details);
+            await this.storageService.setData(key, data);
+            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(sanitizeFqbn(fqbn));
+      if (data === BoardsDataStore.Data.EMPTY) {
+        return undefined;
       }
-      if (shouldFireChanged) {
-        this.fireChanged();
+      return { fqbn, data };
+    }
+  }
+
+  private async updateSelectedBoardData(
+    fqbn: string | undefined,
+    updateConfigOptions = false
+  ): Promise<void> {
+    this._selectedBoardData = await this.getSelectedBoardData(fqbn);
+    if (fqbn && updateConfigOptions) {
+      const { options } = new FQBN(fqbn);
+      if (options) {
+        const optionsToUpdate = Object.entries(options).map(([key, value]) => ({
+          option: key,
+          selectedValue: value,
+        }));
+        const params = { fqbn, optionsToUpdate };
+        await this.selectConfigOption(params);
+        this._selectedBoardData = await this.getSelectedBoardData(fqbn); // reload the updated data
       }
+    }
+  }
+
+  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<void> {
-    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;
     }
     const { configOptions } = await this.getData(fqbn);
-    return ConfigOption.decorate(fqbn, configOptions);
+    return new FQBN(fqbn).withConfigOptions(...configOptions).toString();
   }
 
   async getData(fqbn: string | undefined): Promise<BoardsDataStore.Data> {
@@ -80,83 +205,106 @@ 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(
-    {
-      fqbn,
-      selectedProgrammer,
-    }: { fqbn: string; selectedProgrammer: Programmer },
-  ): Promise<boolean> {
-    const data = deepClone(await this.getData(fqbn));
-    const { programmers } = data;
+  async reloadBoardData(fqbn: string | undefined): Promise<void> {
+    if (!fqbn) {
+      return;
+    }
+    const key = this.getStorageKey(fqbn);
+    const details = await this.loadBoardDetails(fqbn, true);
+    if (!details) {
+      return;
+    }
+    const data = createDataStoreEntry(details);
+    await this.storageService.setData(key, data);
+    this.fireChanged({ fqbn, data });
+  }
+
+  async selectProgrammer({
+    fqbn,
+    selectedProgrammer,
+  }: {
+    fqbn: string;
+    selectedProgrammer: Programmer;
+  }): Promise<boolean> {
+    const sanitizedFQBN = sanitizeFqbn(fqbn);
+    const storedData = deepClone(await this.getData(sanitizedFQBN));
+    const { programmers } = storedData;
     if (!programmers.find((p) => Programmer.equals(selectedProgrammer, p))) {
       return false;
     }
 
-    await this.setData({
-      fqbn,
-      data: { ...data, selectedProgrammer },
-    });
-    this.fireChanged();
+    const change: BoardsDataStoreChange = {
+      fqbn: sanitizedFQBN,
+      data: { ...storedData, selectedProgrammer },
+    };
+    await this.setData(change);
+    this.fireChanged(change);
     return true;
   }
 
-  async selectConfigOption(
-    {
-      fqbn,
-      option,
-      selectedValue,
-    }: { fqbn: string; option: string; selectedValue: string }
-  ): Promise<boolean> {
-    const data = deepClone(await this.getData(fqbn));
-    const { configOptions } = data;
-    const configOption = configOptions.find((c) => c.option === option);
-    if (!configOption) {
+  async selectConfigOption(params: SelectConfigOptionParams): Promise<boolean> {
+    const { fqbn, optionsToUpdate } = params;
+    if (!optionsToUpdate.length) {
       return false;
     }
-    let updated = false;
-    for (const value of configOption.values) {
-      if (value.value === selectedValue) {
-        (value as any).selected = true;
-        updated = true;
-      } else {
-        (value as any).selected = false;
+
+    const sanitizedFQBN = sanitizeFqbn(fqbn);
+    const mutableData = deepClone(await this.getData(sanitizedFQBN));
+    let didChange = false;
+
+    for (const { option, selectedValue } of optionsToUpdate) {
+      const { configOptions } = mutableData;
+      const configOption = configOptions.find((c) => c.option === option);
+      if (configOption) {
+        const configOptionValueIndex = configOption.values.findIndex(
+          (configOptionValue) => configOptionValue.value === selectedValue
+        );
+        if (configOptionValueIndex >= 0) {
+          // unselect all
+          configOption.values
+            .map((value) => value as Mutable<ConfigValue>)
+            .forEach((value) => (value.selected = false));
+          const mutableConfigValue: Mutable<ConfigValue> =
+            configOption.values[configOptionValueIndex];
+          // make the new value `selected`
+          mutableConfigValue.selected = true;
+          didChange = true;
+        }
       }
     }
-    if (!updated) {
+
+    if (!didChange) {
       return false;
     }
-    await this.setData({ fqbn, data });
-    this.fireChanged();
+
+    const change: BoardsDataStoreChange = {
+      fqbn: sanitizedFQBN,
+      data: mutableData,
+    };
+    await this.setData(change);
+    this.fireChanged(change);
     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 +313,15 @@ export class BoardsDataStore implements FrontendApplicationContribution {
     return `.arduinoIDE-configOptions-${fqbn}`;
   }
 
-  protected async getBoardDetailsSafe(
-    fqbn: string
+  async loadBoardDetails(
+    fqbn: string,
+    forceRefresh = false
   ): Promise<BoardDetails | undefined> {
     try {
-      const details = this.boardsService.getBoardDetails({ fqbn });
+      const details = await this.boardsService.getBoardDetails({
+        fqbn,
+        forceRefresh,
+      });
       return details;
     } catch (err) {
       if (
@@ -190,8 +342,8 @@ export class BoardsDataStore implements FrontendApplicationContribution {
     }
   }
 
-  protected fireChanged(): void {
-    this.onChangedEmitter.fire();
+  protected fireChanged(...changes: BoardsDataStoreChange[]): void {
+    this.onDidChangeEmitter.fire({ changes });
   }
 }
 
@@ -200,20 +352,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-list-widget.ts

@@ -4,22 +4,24 @@ import {
   postConstruct,
 } from '@theia/core/shared/inversify';
 import {
+  BoardSearch,
   BoardsPackage,
   BoardsService,
 } from '../../common/protocol/boards-service';
 import { ListWidget } from '../widgets/component-list/list-widget';
 import { ListItemRenderer } from '../widgets/component-list/list-item-renderer';
 import { nls } from '@theia/core/lib/common';
+import { BoardsFilterRenderer } from '../widgets/component-list/filter-renderer';
 
 @injectable()
-export class BoardsListWidget extends ListWidget<BoardsPackage> {
+export class BoardsListWidget extends ListWidget<BoardsPackage, BoardSearch> {
   static WIDGET_ID = 'boards-list-widget';
   static WIDGET_LABEL = nls.localize('arduino/boardsManager', 'Boards Manager');
 
   constructor(
-    @inject(BoardsService) protected service: BoardsService,
-    @inject(ListItemRenderer)
-    protected itemRenderer: ListItemRenderer<BoardsPackage>
+    @inject(BoardsService) service: BoardsService,
+    @inject(ListItemRenderer) itemRenderer: ListItemRenderer<BoardsPackage>,
+    @inject(BoardsFilterRenderer) filterRenderer: BoardsFilterRenderer
   ) {
     super({
       id: BoardsListWidget.WIDGET_ID,
@@ -28,8 +30,9 @@ export class BoardsListWidget extends ListWidget<BoardsPackage> {
       searchable: service,
       installable: service,
       itemLabel: (item: BoardsPackage) => item.name,
-      itemDeprecated: (item: BoardsPackage) => item.deprecated,
       itemRenderer,
+      filterRenderer,
+      defaultSearchOptions: { query: '', type: 'All' },
     });
   }
 

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,
+  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,
-    onClick,
   }: {
-    boardLabel: string;
-    port: Port;
-    selected?: boolean;
-    onClick: () => void;
+    item: BoardListItemUI;
+    selected: boolean;
   }): React.ReactNode {
-    const protocolIcon = iconNameFromProtocol(port.protocol);
+    const { boardLabel, portLabel, portProtocol, tooltip } = item.labels;
+    const port = item.port;
     const onKeyUp = (e: React.KeyboardEvent) => {
       if (e.key === 'Enter') {
-        onClick();
+        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--board-label noWrapInfo noselect">
-            {boardLabel}
+        <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.address}
+            {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/boards/boards-widget-frontend-contribution.ts

@@ -1,10 +1,17 @@
 import { injectable } from '@theia/core/shared/inversify';
-import { BoardsListWidget } from './boards-list-widget';
-import { BoardsPackage } from '../../common/protocol/boards-service';
+import {
+  BoardSearch,
+  BoardsPackage,
+} from '../../common/protocol/boards-service';
+import { URI } from '../contributions/contribution';
 import { ListWidgetFrontendContribution } from '../widgets/component-list/list-widget-frontend-contribution';
+import { BoardsListWidget } from './boards-list-widget';
 
 @injectable()
-export class BoardsListWidgetFrontendContribution extends ListWidgetFrontendContribution<BoardsPackage> {
+export class BoardsListWidgetFrontendContribution extends ListWidgetFrontendContribution<
+  BoardsPackage,
+  BoardSearch
+> {
   constructor() {
     super({
       widgetId: BoardsListWidget.WIDGET_ID,
@@ -18,7 +25,16 @@ export class BoardsListWidgetFrontendContribution extends ListWidgetFrontendCont
     });
   }
 
-  override async initializeLayout(): Promise<void> {
-    this.openView();
+  protected canParse(uri: URI): boolean {
+    try {
+      BoardSearch.UriParser.parse(uri);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
+  protected parse(uri: URI): BoardSearch | undefined {
+    return BoardSearch.UriParser.parse(uri);
   }
 }

arduino-ide-extension/src/browser/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/config/config-service-client.ts

@@ -0,0 +1,102 @@
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { Emitter, Event } from '@theia/core/lib/common/event';
+import { MessageService } from '@theia/core/lib/common/message-service';
+import { deepClone } from '@theia/core/lib/common/objects';
+import URI from '@theia/core/lib/common/uri';
+import {
+  inject,
+  injectable,
+  postConstruct,
+} from '@theia/core/shared/inversify';
+import { ConfigService, ConfigState } from '../../common/protocol';
+import { NotificationCenter } from '../notification-center';
+
+@injectable()
+export class ConfigServiceClient implements FrontendApplicationContribution {
+  @inject(ConfigService)
+  private readonly delegate: ConfigService;
+  @inject(NotificationCenter)
+  private readonly notificationCenter: NotificationCenter;
+  @inject(FrontendApplicationStateService)
+  private readonly appStateService: FrontendApplicationStateService;
+  @inject(MessageService)
+  private readonly messageService: MessageService;
+
+  private readonly didChangeSketchDirUriEmitter = new Emitter<
+    URI | undefined
+  >();
+  private readonly didChangeDataDirUriEmitter = new Emitter<URI | undefined>();
+  private readonly toDispose = new DisposableCollection(
+    this.didChangeSketchDirUriEmitter,
+    this.didChangeDataDirUriEmitter
+  );
+
+  private config: ConfigState | undefined;
+
+  @postConstruct()
+  protected init(): void {
+    this.appStateService.reachedState('ready').then(async () => {
+      const config = await this.delegate.getConfiguration();
+      this.use(config);
+    });
+  }
+
+  onStart(): void {
+    this.notificationCenter.onConfigDidChange((config) => this.use(config));
+  }
+
+  onStop(): void {
+    this.toDispose.dispose();
+  }
+
+  get onDidChangeSketchDirUri(): Event<URI | undefined> {
+    return this.didChangeSketchDirUriEmitter.event;
+  }
+
+  get onDidChangeDataDirUri(): Event<URI | undefined> {
+    return this.didChangeDataDirUriEmitter.event;
+  }
+
+  /**
+   * CLI config related error messages if any.
+   */
+  tryGetMessages(): string[] | undefined {
+    return this.config?.messages;
+  }
+
+  /**
+   * `directories.user`
+   */
+  tryGetSketchDirUri(): URI | undefined {
+    return this.config?.config?.sketchDirUri
+      ? new URI(this.config?.config?.sketchDirUri)
+      : undefined;
+  }
+
+  /**
+   * `directories.data`
+   */
+  tryGetDataDirUri(): URI | undefined {
+    return this.config?.config?.dataDirUri
+      ? new URI(this.config?.config?.dataDirUri)
+      : undefined;
+  }
+
+  private use(config: ConfigState): void {
+    const oldConfig = deepClone(this.config);
+    this.config = config;
+    if (oldConfig?.config?.sketchDirUri !== this.config?.config?.sketchDirUri) {
+      this.didChangeSketchDirUriEmitter.fire(this.tryGetSketchDirUri());
+    }
+    if (oldConfig?.config?.dataDirUri !== this.config?.config?.dataDirUri) {
+      this.didChangeDataDirUriEmitter.fire(this.tryGetDataDirUri());
+    }
+    if (this.config.messages?.length) {
+      const message = this.config.messages.join(' ');
+      // toast the error later otherwise it might not show up in IDE2
+      setTimeout(() => this.messageService.error(message), 1_000);
+    }
+  }
+}

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,23 +38,18 @@ export class About extends Contribution {
     });
   }
 
-  async showAbout(): Promise<void> {
-    const {
-      version,
-      commit,
-      status: cliStatus,
-    } = 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}{4} [{5}]\n\n{6}',
-        remote.app.getVersion(),
+        'Version: {0}\nDate: {1}{2}\nCLI Version: {3}\n\n{4}',
+        appVersion,
         buildDate ? buildDate : nls.localize('', 'dev build'),
         buildDate && showAll ? ` (${this.ago(buildDate)})` : '',
-        version,
-        cliStatus ? ` ${cliStatus}` : '',
-        commit,
+        cliVersion,
         nls.localize(
           'arduino/about/copyright',
           'Copyright © {0} Arduino SA',
@@ -66,34 +59,27 @@ 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(),
-      {
-        message: `${this.applicationName}`,
-        title: `${this.applicationName}`,
-        type: 'info',
-        detail: detail(true),
-        buttons,
-        noLink: true,
-        defaultId: buttons.indexOf(ok),
-        cancelId: buttons.indexOf(ok),
-      }
-    );
+    const { response } = await this.dialogService.showMessageBox({
+      message: `${this.applicationName}`,
+      title: `${this.applicationName}`,
+      type: 'info',
+      detail: detail(true),
+      buttons,
+      noLink: true,
+      defaultId: buttons.indexOf(ok),
+      cancelId: buttons.indexOf(ok),
+    });
 
     if (buttons[response] === copy) {
       await this.clipboardService.writeText(detail(false).trim());
     }
   }
 
-  protected get applicationName(): string {
+  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/account.ts

@@ -0,0 +1,155 @@
+import { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
+import { SidebarMenu } from '@theia/core/lib/browser/shell/sidebar-menu-widget';
+import { WindowService } from '@theia/core/lib/browser/window/window-service';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { MenuPath } from '@theia/core/lib/common/menu';
+import { nls } from '@theia/core/lib/common/nls';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { CloudUserCommands, LEARN_MORE_URL } from '../auth/cloud-user-commands';
+import { CreateFeatures } from '../create/create-features';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import { ApplicationConnectionStatusContribution } from '../theia/core/connection-status-service';
+import {
+  Command,
+  CommandRegistry,
+  Contribution,
+  MenuModelRegistry,
+} from './contribution';
+
+export const accountMenu: SidebarMenu = {
+  id: 'arduino-accounts-menu',
+  iconClass: 'codicon codicon-account',
+  title: nls.localize('arduino/account/menuTitle', 'Arduino Cloud'),
+  menuPath: ArduinoMenus.ARDUINO_ACCOUNT__CONTEXT,
+  order: 0,
+};
+
+@injectable()
+export class Account extends Contribution {
+  @inject(WindowService)
+  private readonly windowService: WindowService;
+  @inject(CreateFeatures)
+  private readonly createFeatures: CreateFeatures;
+  @inject(ApplicationConnectionStatusContribution)
+  private readonly connectionStatus: ApplicationConnectionStatusContribution;
+
+  private readonly toDispose = new DisposableCollection();
+  private app: FrontendApplication;
+
+  override onStart(app: FrontendApplication): void {
+    this.app = app;
+    this.updateSidebarCommand();
+    this.toDispose.push(
+      this.createFeatures.onDidChangeEnabled((enabled) =>
+        this.updateSidebarCommand(enabled)
+      )
+    );
+  }
+
+  onStop(): void {
+    this.toDispose.dispose();
+  }
+
+  override registerCommands(registry: CommandRegistry): void {
+    const openExternal = (url: string) =>
+      this.windowService.openNewWindow(url, { external: true });
+    const loggedIn = () => Boolean(this.createFeatures.session);
+    const loggedInWithInternetConnection = () =>
+      loggedIn() && this.connectionStatus.offlineStatus !== 'internet';
+    registry.registerCommand(Account.Commands.LEARN_MORE, {
+      execute: () => openExternal(LEARN_MORE_URL),
+      isEnabled: () => !loggedIn(),
+      isVisible: () => !loggedIn(),
+    });
+    registry.registerCommand(Account.Commands.GO_TO_PROFILE, {
+      execute: () => openExternal('https://id.arduino.cc/'),
+      isEnabled: () => loggedInWithInternetConnection(),
+      isVisible: () => loggedIn(),
+    });
+    registry.registerCommand(Account.Commands.GO_TO_CLOUD_EDITOR, {
+      execute: () => openExternal('https://create.arduino.cc/editor'),
+      isEnabled: () => loggedInWithInternetConnection(),
+      isVisible: () => loggedIn(),
+    });
+    registry.registerCommand(Account.Commands.GO_TO_IOT_CLOUD, {
+      execute: () => openExternal('https://create.arduino.cc/iot/'),
+      isEnabled: () => loggedInWithInternetConnection(),
+      isVisible: () => loggedIn(),
+    });
+  }
+
+  override registerMenus(registry: MenuModelRegistry): void {
+    const register = (
+      menuPath: MenuPath,
+      ...commands: (Command | [command: Command, menuLabel: string])[]
+    ) =>
+      commands.forEach((command, index) => {
+        const commandId = Array.isArray(command) ? command[0].id : command.id;
+        const label = Array.isArray(command) ? command[1] : command.label;
+        registry.registerMenuAction(menuPath, {
+          label,
+          commandId,
+          order: String(index),
+        });
+      });
+
+    register(ArduinoMenus.ARDUINO_ACCOUNT__CONTEXT__SIGN_IN_GROUP, [
+      CloudUserCommands.LOGIN,
+      nls.localize('arduino/cloud/signInToCloud', 'Sign in to Arduino Cloud'),
+    ]);
+    register(ArduinoMenus.ARDUINO_ACCOUNT__CONTEXT__LEARN_MORE_GROUP, [
+      Account.Commands.LEARN_MORE,
+      nls.localize('arduino/cloud/learnMore', 'Learn more'),
+    ]);
+    register(
+      ArduinoMenus.ARDUINO_ACCOUNT__CONTEXT__GO_TO_GROUP,
+      [
+        Account.Commands.GO_TO_PROFILE,
+        nls.localize('arduino/account/goToProfile', 'Go to Profile'),
+      ],
+      [
+        Account.Commands.GO_TO_CLOUD_EDITOR,
+        nls.localize('arduino/account/goToCloudEditor', 'Go to Cloud Editor'),
+      ],
+      [
+        Account.Commands.GO_TO_IOT_CLOUD,
+        nls.localize('arduino/account/goToIoTCloud', 'Go to IoT Cloud'),
+      ]
+    );
+    register(
+      ArduinoMenus.ARDUINO_ACCOUNT__CONTEXT__SIGN_OUT_GROUP,
+      CloudUserCommands.LOGOUT
+    );
+  }
+
+  private updateSidebarCommand(
+    visible: boolean = this.preferences['arduino.cloud.enabled']
+  ): void {
+    if (!this.app) {
+      return;
+    }
+    const handler = this.app.shell.leftPanelHandler;
+    if (visible) {
+      handler.addBottomMenu(accountMenu);
+    } else {
+      handler.removeBottomMenu(accountMenu.id);
+    }
+  }
+}
+
+export namespace Account {
+  export namespace Commands {
+    export const GO_TO_PROFILE: Command = {
+      id: 'arduino-go-to-profile',
+    };
+    export const GO_TO_CLOUD_EDITOR: Command = {
+      id: 'arduino-go-to-cloud-editor',
+    };
+    export const GO_TO_IOT_CLOUD: Command = {
+      id: 'arduino-go-to-iot-cloud',
+    };
+    export const LEARN_MORE: Command = {
+      id: 'arduino-learn-more',
+    };
+  }
+}

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

@@ -1,21 +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,
+  Sketch,
+  SketchContribution,
   URI,
 } from './contribution';
-import { FileDialogService } from '@theia/filesystem/lib/browser';
-import { nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
 
 @injectable()
 export class AddFile extends SketchContribution {
   @inject(FileDialogService)
-  protected readonly fileDialogService: FileDialogService;
+  private readonly fileDialogService: FileDialogService; // TODO: use dialogService
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(AddFile.Commands.ADD_FILE, {
@@ -31,7 +31,7 @@ export class AddFile extends SketchContribution {
     });
   }
 
-  protected async addFile(): Promise<void> {
+  private async addFile(): Promise<void> {
     const sketch = await this.sketchServiceClient.currentSketch();
     if (!CurrentSketch.isValid(sketch)) {
       return;
@@ -41,16 +41,15 @@ export class AddFile extends SketchContribution {
       canSelectFiles: true,
       canSelectFolders: false,
       canSelectMany: false,
+      modal: true,
     });
     if (!toAddUri) {
       return;
     }
-    const sketchUri = new URI(sketch.uri);
-    const filename = toAddUri.path.base;
-    const targetUri = sketchUri.resolve('data').resolve(filename);
+    const { 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: [
@@ -79,6 +78,22 @@ export class AddFile extends SketchContribution {
       }
     );
   }
+
+  // https://github.com/arduino/arduino-ide/issues/284#issuecomment-1364533662
+  // File the file to add has one of the following extension, it goes to the sketch folder root: .ino, .h, .cpp, .c, .S
+  // Otherwise, the files goes to the `data` folder inside the sketch folder root.
+  private resolveTarget(
+    sketch: Sketch,
+    toAddUri: URI
+  ): { uri: URI; filename: string } {
+    const path = toAddUri.path;
+    const filename = path.base;
+    let root = new URI(sketch.uri);
+    if (!Sketch.Extensions.CODE_FILES.includes(path.ext)) {
+      root = root.resolve('data');
+    }
+    return { uri: root.resolve(filename), filename: filename };
+  }
 }
 
 export namespace AddFile {

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

@@ -1,8 +1,6 @@
 import { inject, injectable } from '@theia/core/shared/inversify';
-import * as remote from '@theia/core/electron-shared/@electron/remote';
 import URI from '@theia/core/lib/common/uri';
 import { ConfirmDialog } from '@theia/core/lib/browser/dialogs';
-import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { LibraryService, ResponseServiceClient } from '../../common/protocol';
 import { ExecuteWithProgress } from '../../common/protocol/progressible';
@@ -16,14 +14,11 @@ import { nls } from '@theia/core/lib/common';
 
 @injectable()
 export class AddZipLibrary extends SketchContribution {
-  @inject(EnvVariablesServer)
-  protected readonly envVariableServer: EnvVariablesServer;
-
   @inject(ResponseServiceClient)
-  protected readonly responseService: ResponseServiceClient;
+  private readonly responseService: ResponseServiceClient;
 
   @inject(LibraryService)
-  protected readonly libraryService: LibraryService;
+  private readonly libraryService: LibraryService;
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(AddZipLibrary.Commands.ADD_ZIP_LIBRARY, {
@@ -43,10 +38,10 @@ export class AddZipLibrary extends SketchContribution {
     });
   }
 
-  async addZipLibrary(): Promise<void> {
+  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({
+    const { canceled, filePaths } = await this.dialogService.showOpenDialog({
       title: nls.localize(
         'arduino/selectZip',
         "Select a zip file containing the library you'd like to add"

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

@@ -1,7 +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 URI from '@theia/core/lib/common/uri';
+import dateFormat from 'dateformat';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import {
   SketchContribution,
@@ -10,7 +8,7 @@ import {
   MenuModelRegistry,
 } from './contribution';
 import { nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
+import { CurrentSketch } from '../sketches-service-client-impl';
 
 @injectable()
 export class ArchiveSketch extends SketchContribution {
@@ -28,11 +26,8 @@ export class ArchiveSketch extends SketchContribution {
     });
   }
 
-  protected async archiveSketch(): Promise<void> {
-    const [sketch, config] = await Promise.all([
-      this.sketchServiceClient.currentSketch(),
-      this.configService.getConfiguration(),
-    ]);
+  private async archiveSketch(): Promise<void> {
+    const sketch = await this.sketchServiceClient.currentSketch();
     if (!CurrentSketch.isValid(sketch)) {
       return;
     }
@@ -40,10 +35,10 @@ export class ArchiveSketch extends SketchContribution {
       new Date(),
       'yymmdd'
     )}a.zip`;
-    const defaultPath = await this.fileService.fsPath(
-      new URI(config.sketchDirUri).resolve(archiveBasename)
-    );
-    const { filePath, canceled } = await remote.dialog.showSaveDialog({
+    const defaultContainerUri = await this.defaultUri();
+    const defaultUri = defaultContainerUri.resolve(archiveBasename);
+    const defaultPath = await this.fileService.fsPath(defaultUri);
+    const { filePath, canceled } = await this.dialogService.showSaveDialog({
       title: nls.localize(
         'arduino/sketch/saveSketchAs',
         'Save sketch folder as...'
@@ -57,7 +52,7 @@ export class ArchiveSketch extends SketchContribution {
     if (!destinationUri) {
       return;
     }
-    await this.sketchService.archive(sketch, destinationUri.toString());
+    await this.sketchesService.archive(sketch, destinationUri.toString());
     this.messageService.info(
       nls.localize(
         'arduino/sketch/createdArchive',

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,134 +1,137 @@
-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 { firstToUpperCase } from '../../common/utils';
-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 { BoardsDataStore } from '../boards/boards-data-store';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
 import {
   ArduinoMenus,
   PlaceholderMenuNode,
   unregisterSubmenu,
 } from '../menu/arduino-menus';
-import {
-  BoardsService,
-  InstalledBoardWithPackage,
-  AvailablePorts,
-  Port,
-} from '../../common/protocol';
-import { SketchContribution, Command, CommandRegistry } from './contribution';
-import { nls } from '@theia/core/lib/common';
+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(BoardsDataStore)
+  private readonly boardsDataStore: BoardsDataStore;
   @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 { selectedBoard, selectedPort } =
-          this.boardsServiceProvider.boardsConfig;
-        if (!selectedBoard) {
-          this.messageService.info(
-            nls.localize(
-              'arduino/board/selectBoardForInfo',
-              'Please select a board to obtain board info.'
-            )
-          );
+        const boardInfo = await getBoardInfo(
+          this.boardsServiceProvider.boardList
+        );
+        if (typeof boardInfo === 'string') {
+          this.messageService.info(boardInfo);
           return;
         }
-        if (!selectedBoard.fqbn) {
-          this.messageService.info(
-            nls.localize(
-              'arduino/board/platformMissing',
-              "The platform for the selected '{0}' board is not installed.",
-              selectedBoard.name
-            )
-          );
-          return;
-        }
-        if (!selectedPort) {
-          this.messageService.info(
-            nls.localize(
-              'arduino/board/selectPortForInfo',
-              'Please select a port to obtain board info.'
-            )
-          );
-          return;
-        }
-        const boardDetails = await this.boardsService.getBoardDetails({
-          fqbn: selectedBoard.fqbn,
-        });
-        if (boardDetails) {
-          const { VID, PID } = boardDetails;
-          const detail = `BN: ${selectedBoard.name}
+        const { BN, VID, PID, SN } = boardInfo;
+        const detail = `
+BN: ${BN}
 VID: ${VID}
-PID: ${PID}`;
-          await remote.dialog.showMessageBox(remote.getCurrentWindow(), {
-            message: nls.localize('arduino/board/boardInfo', 'Board Info'),
-            title: nls.localize('arduino/board/boardInfo', 'Board Info'),
-            type: 'info',
-            detail,
-            buttons: [nls.localize('vscode/issueMainService/ok', 'OK')],
-          });
+PID: ${PID}
+SN: ${SN}
+`.trim();
+        await this.dialogService.showMessageBox({
+          message: nls.localize('arduino/board/boardInfo', 'Board Info'),
+          title: nls.localize('arduino/board/boardInfo', 'Board Info'),
+          type: 'info',
+          detail,
+          buttons: [nls.localize('vscode/issueMainService/ok', 'OK')],
+        });
+      },
+    });
+
+    registry.registerCommand(BoardSelection.Commands.RELOAD_BOARD_DATA, {
+      execute: async () => {
+        const selectedFqbn =
+          this.boardsServiceProvider.boardList.boardsConfig.selectedBoard?.fqbn;
+        let message: string;
+
+        if (selectedFqbn) {
+          await this.boardsDataStore.reloadBoardData(selectedFqbn);
+          message = nls.localize(
+            'arduino/board/boardDataReloaded',
+            'Board data reloaded.'
+          );
+        } else {
+          message = nls.localize(
+            'arduino/board/selectBoardToReload',
+            'Please select a board first.'
+          );
         }
+
+        this.messageService.info(message, { timeout: 2000 });
       },
     });
   }
 
   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();
 
@@ -137,7 +140,8 @@ PID: ${PID}`;
       ...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(
@@ -156,11 +160,8 @@ PID: ${PID}`;
     );
 
     // Ports submenu
-    const portsSubmenuPath = [
-      ...ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP,
-      '2_ports',
-    ];
-    const portsSubmenuLabel = config.selectedPort?.address;
+    const portsSubmenuPath = ArduinoMenus.TOOLS__PORTS_SUBMENU;
+    const portsSubmenuLabel = selectedPort?.address;
     this.menuModelRegistry.registerSubmenu(
       portsSubmenuPath,
       nls.localize(
@@ -176,6 +177,21 @@ PID: ${PID}`;
       )
     );
 
+    const reloadBoardData = {
+      commandId: BoardSelection.Commands.RELOAD_BOARD_DATA.id,
+      label: nls.localize('arduino/board/reloadBoardData', 'Reload Board Data'),
+      order: '102',
+    };
+    this.menuModelRegistry.registerMenuAction(
+      ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP,
+      reloadBoardData
+    );
+    this.toDisposeBeforeMenuRebuild.push(
+      Disposable.create(() =>
+        this.menuModelRegistry.unregisterMenuAction(reloadBoardData)
+      )
+    );
+
     const getBoardInfo = {
       commandId: BoardSelection.Commands.GET_BOARD_INFO.id,
       label: nls.localize('arduino/board/getBoardInfo', 'Get Board Info'),
@@ -199,64 +215,116 @@ PID: ${PID}`;
       label: `${BoardsListWidget.WIDGET_LABEL}...`,
     });
 
-    // Installed boards
+    const selectedBoardPlatformId = selectedBoard
+      ? createPlatformIdentifier(selectedBoard)
+      : undefined;
+
+    // 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, fqbn, name, manuallyInstalled } = board;
-
-      const packageLabel =
-        packageName +
-        `${manuallyInstalled
-          ? nls.localize('arduino/board/inSketchbook', ' (in Sketchbook)')
-          : ''
-        }`;
-      // Platform submenu
-      const platformMenuPath = [...boardsPackagesGroup, packageId];
-      // Note: Registering the same submenu twice is a noop. No need to group the boards per platform.
-      this.menuModelRegistry.registerSubmenu(platformMenuPath, packageLabel, {
-        order: packageName.toLowerCase(),
-      });
-
-      const id = `arduino-select-board--${fqbn}`;
-      const command = { id };
-      const handler = {
-        execute: () => {
-          if (
-            fqbn !== this.boardsServiceProvider.boardsConfig.selectedBoard?.fqbn
-          ) {
-            this.boardsServiceProvider.boardsConfig = {
-              selectedBoard: {
-                name,
-                fqbn,
-                port: this.boardsServiceProvider.boardsConfig.selectedBoard
-                  ?.port, // TODO: verify!
-              },
-              selectedPort:
-                this.boardsServiceProvider.boardsConfig.selectedPort,
-            };
-          }
-        },
-        isToggled: () =>
-          fqbn === this.boardsServiceProvider.boardsConfig.selectedBoard?.fqbn,
-      };
-
-      // Board menu
-      const menuAction = { commandId: id, label: name };
-      this.commandRegistry.registerCommand(command, handler);
-      this.toDisposeBeforeMenuRebuild.push(
-        Disposable.create(() => this.commandRegistry.unregisterCommand(command))
-      );
-      this.menuModelRegistry.registerMenuAction(platformMenuPath, menuAction);
-      // Note: we do not dispose the menu actions individually. Calling `unregisterSubmenu` on the parent will wipe the children menu nodes recursively.
+      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 ports
+    // 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)'
+                      )
+                    : ''
+                }`;
+              if (
+                selectedBoardPlatformId &&
+                platformIdentifierEquals(packageId, selectedBoardPlatformId)
+              ) {
+                packageLabel = `● ${packageLabel}`;
+              }
+              if (useVendorSuffix) {
+                packageLabel += ` (${vendorId})`;
+              }
+              // Platform submenu
+              platformMenuPath = [
+                ...boardsPackagesGroup,
+                serializePlatformIdentifier(packageId),
+              ];
+              this.menuModelRegistry.registerSubmenu(
+                platformMenuPath,
+                packageLabel,
+                {
+                  order: packageName.toLowerCase(),
+                }
+              );
+            }
+
+            const id = `arduino-select-board--${fqbn}`;
+            const command = { id };
+            const handler = {
+              execute: () =>
+                this.boardsServiceProvider.updateConfig({
+                  name: name,
+                  fqbn: fqbn,
+                }),
+              isToggled: () => fqbn === selectedBoard?.fqbn,
+            };
+
+            // Board menu
+            const menuAction = {
+              commandId: id,
+              label: name,
+              order: String(index).padStart(4), // pads with leading zeros for alphanumeric sort where order is 1, 2, 11, and NOT 1, 11, 2
+            };
+            this.commandRegistry.registerCommand(command, handler);
+            this.toDisposeBeforeMenuRebuild.push(
+              Disposable.create(() =>
+                this.commandRegistry.unregisterCommand(command)
+              )
+            );
+            this.menuModelRegistry.registerMenuAction(
+              platformMenuPath,
+              menuAction
+            );
+            // Note: we do not dispose the menu actions individually. Calling `unregisterSubmenu` on the parent will wipe the children menu nodes recursively.
+          });
+        });
+      }
+    );
+
+    // 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;
       }
 
@@ -267,8 +335,12 @@ PID: ${PID}`;
       ];
       const placeholder = new PlaceholderMenuNode(
         menuPath,
-        `${firstToUpperCase(protocol)} ports`,
-        { order: protocolOrder.toString() }
+        nls.localize(
+          'arduino/board/typeOfPorts',
+          '{0} ports',
+          Port.Protocols.protocolLabel(protocol)
+        ),
+        { order: protocolOrder.toString().padStart(4) }
       );
       this.menuModelRegistry.registerMenuNode(menuPath, placeholder);
       this.toDisposeBeforeMenuRebuild.push(
@@ -277,49 +349,31 @@ PID: ${PID}`;
         )
       );
 
-      // First we show addresses with recognized boards connected,
-      // then all the rest.
-      const sortedIDs = Object.keys(ports).sort((left: string, right: string): number => {
-        const [, leftBoards] = ports[left];
-        const [, rightBoards] = ports[right];
-        return rightBoards.length - leftBoards.length;
-      });
-
-      for (let i = 0; i < sortedIDs.length; i++) {
-        const portID = sortedIDs[i];
-        const [port, boards] = ports[portID];
-        let label = `${port.address}`;
-        if (boards.length) {
+      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) {
           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,
           label,
-          order: `${protocolOrder + i + 1}`,
+          order: String(protocolOrder + i + 1).padStart(4),
         };
         this.commandRegistry.registerCommand(command, handler);
         this.toDisposeBeforeMenuRebuild.push(
@@ -331,32 +385,25 @@ PID: ${PID}`;
       }
     };
 
-    const grouped = AvailablePorts.byProtocol(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();
   }
 
   protected async installedBoards(): Promise<InstalledBoardWithPackage[]> {
-    const allBoards = await this.boardsService.searchBoards({});
+    const allBoards = await this.boardsService.getInstalledBoards();
     return allBoards.filter(InstalledBoardWithPackage.is);
   }
 }
 export namespace BoardSelection {
   export namespace Commands {
     export const GET_BOARD_INFO: Command = { id: 'arduino-get-board-info' };
+    export const RELOAD_BOARD_DATA: Command = {
+      id: 'arduino-reload-board-data',
+    };
   }
 }

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(() =>
-        this.updateMenuActions(
-          this.boardsServiceClient.boardsConfig.selectedBoard
-        )
-      );
-    this.boardsDataStore.onChanged(() =>
+  override onStart(): void {
+    this.boardsDataStore.onDidChange(() =>
       this.updateMenuActions(
-        this.boardsServiceClient.boardsConfig.selectedBoard
+        this.boardsServiceProvider.boardsConfig.selectedBoard
       )
     );
-    this.boardsServiceClient.onBoardsConfigChanged(({ selectedBoard }) =>
-      this.updateMenuActions(selectedBoard)
+    this.boardsServiceProvider.onBoardsConfigDidChange((event) => {
+      if (isBoardIdentifierChangeEvent(event)) {
+        this.updateMenuActions(event.selectedBoard);
+      }
+    });
+  }
+
+  override onReady(): void {
+    this.boardsServiceProvider.ready.then(() =>
+      this.updateMenuActions(
+        this.boardsServiceProvider.boardsConfig.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) {
@@ -80,16 +79,15 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
                 string,
                 Disposable & { label: string }
               >();
+              let selectedValue = '';
               for (const value of values) {
                 const id = `${fqbn}-${option}--${value.value}`;
                 const command = { id };
-                const selectedValue = value.value;
                 const handler = {
                   execute: () =>
                     this.boardsDataStore.selectConfigOption({
                       fqbn,
-                      option,
-                      selectedValue,
+                      optionsToUpdate: [{ option, selectedValue: value.value }],
                     }),
                   isToggled: () => value.selected,
                 };
@@ -100,8 +98,14 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
                     { label: value.label }
                   )
                 );
+                if (value.selected) {
+                  selectedValue = value.label;
+                }
               }
-              this.menuRegistry.registerSubmenu(menuPath, label);
+              this.menuRegistry.registerSubmenu(
+                menuPath,
+                `${label}${selectedValue ? `: "${selectedValue}"` : ''}`
+              );
               this.toDisposeOnBoardChange.pushAll([
                 ...commands.values(),
                 Disposable.create(() =>
@@ -111,7 +115,7 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
                   const { label } = commands.get(commandId)!;
                   this.menuRegistry.registerMenuAction(menuPath, {
                     commandId,
-                    order: `${i}`,
+                    order: String(i).padStart(4),
                     label,
                   });
                   return Disposable.create(() =>
@@ -166,7 +170,7 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
               ]);
             }
           }
-          this.mainMenuManager.update();
+          this.menuManager.update();
         }
       }
     });

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

@@ -29,6 +29,7 @@ export class BurnBootloader extends CoreServiceContribution {
   }
 
   private async burnBootloader(): Promise<void> {
+    this.clearVisibleNotification();
     const options = await this.options();
     try {
       await this.doWithProgress({
@@ -36,11 +37,15 @@ export class BurnBootloader extends CoreServiceContribution {
           'arduino/bootloader/burningBootloader',
           'Burning bootloader...'
         ),
-        task: (progressId, coreService) =>
-          coreService.burnBootloader({
-            ...options,
-            progressId,
-          }),
+        task: (progressId, coreService, token) =>
+          coreService.burnBootloader(
+            {
+              ...options,
+              progressId,
+            },
+            token
+          ),
+        cancelable: true,
       });
       this.messageService.info(
         nls.localize(

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

@@ -0,0 +1,123 @@
+import { nls } from '@theia/core/lib/common/nls';
+import { LocalStorageService } from '@theia/core/lib/browser/storage-service';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import {
+  IDEUpdater,
+  LAST_USED_IDE_VERSION,
+  SKIP_IDE_VERSION,
+} from '../../common/protocol/ide-updater';
+import { IDEUpdaterDialog } from '../dialogs/ide-updater/ide-updater-dialog';
+import { Contribution } from './contribution';
+import { VersionWelcomeDialog } from '../dialogs/version-welcome-dialog';
+import { AppService } from '../app-service';
+import { SemVer } from 'semver';
+
+@injectable()
+export class CheckForIDEUpdates extends Contribution {
+  @inject(IDEUpdater)
+  private readonly updater: IDEUpdater;
+
+  @inject(IDEUpdaterDialog)
+  private readonly updaterDialog: IDEUpdaterDialog;
+
+  @inject(VersionWelcomeDialog)
+  private readonly versionWelcomeDialog: VersionWelcomeDialog;
+
+  @inject(LocalStorageService)
+  private readonly localStorage: LocalStorageService;
+
+  @inject(AppService)
+  private readonly appService: AppService;
+
+  override onStart(): void {
+    this.preferences.onPreferenceChanged(
+      ({ preferenceName, newValue, oldValue }) => {
+        if (newValue !== oldValue) {
+          switch (preferenceName) {
+            case 'arduino.ide.updateChannel':
+            case 'arduino.ide.updateBaseUrl':
+              this.updater.init(
+                this.preferences.get('arduino.ide.updateChannel'),
+                this.preferences.get('arduino.ide.updateBaseUrl')
+              );
+          }
+        }
+      }
+    );
+  }
+
+  override async onReady(): Promise<void> {
+    this.updater
+      .init(
+        this.preferences.get('arduino.ide.updateChannel'),
+        this.preferences.get('arduino.ide.updateBaseUrl')
+      )
+      .then(() => {
+        if (!this.preferences['arduino.checkForUpdates']) {
+          return;
+        }
+        return this.updater.checkForUpdates(true);
+      })
+      .then(async (updateInfo) => {
+        if (!updateInfo) {
+          const isNewVersion = await this.isNewStableVersion();
+          if (isNewVersion) {
+            this.versionWelcomeDialog.open();
+          }
+          return;
+        }
+        const versionToSkip = await this.localStorage.getData<string>(
+          SKIP_IDE_VERSION
+        );
+        if (versionToSkip === updateInfo.version) return;
+        this.updaterDialog.open(true, updateInfo);
+      })
+      .catch((e) => {
+        this.messageService.error(
+          nls.localize(
+            'arduino/ide-updater/errorCheckingForUpdates',
+            'Error while checking for Arduino IDE updates.\n{0}',
+            e.message
+          )
+        );
+      })
+      .finally(() => {
+        this.setCurrentIDEVersion();
+      });
+  }
+
+  private async setCurrentIDEVersion(): Promise<void> {
+    try {
+      const { appVersion } = await this.appService.info();
+      const currSemVer = new SemVer(appVersion ?? '');
+      this.localStorage.setData(LAST_USED_IDE_VERSION, currSemVer.format());
+    } catch {
+      // ignore invalid versions
+    }
+  }
+
+  /**
+   * Check if user is running a new IDE version for the first time.
+   * @returns true if the current IDE version is greater than the last used version
+   * and both are non-prerelease versions.
+   */
+  private async isNewStableVersion(): Promise<boolean> {
+    try {
+      const { appVersion } = await this.appService.info();
+      const prevVersion = await this.localStorage.getData<string>(
+        LAST_USED_IDE_VERSION
+      );
+
+      const prevSemVer = new SemVer(prevVersion ?? '');
+      const currSemVer = new SemVer(appVersion ?? '');
+
+      if (prevSemVer.prerelease.length || currSemVer.prerelease.length) {
+        return false;
+      }
+
+      return currSemVer.compare(prevSemVer) === 1;
+    } catch (e) {
+      return false;
+    }
+  }
+}

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

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

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

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

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

@@ -0,0 +1,121 @@
+import { CompositeTreeNode } from '@theia/core/lib/browser/tree';
+import { nls } from '@theia/core/lib/common/nls';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { CreateApi } from '../create/create-api';
+import { CreateFeatures } from '../create/create-features';
+import { CreateUri } from '../create/create-uri';
+import { Create, isNotFound } from '../create/typings';
+import { CloudSketchbookTree } from '../widgets/cloud-sketchbook/cloud-sketchbook-tree';
+import { CloudSketchbookTreeModel } from '../widgets/cloud-sketchbook/cloud-sketchbook-tree-model';
+import { CloudSketchbookTreeWidget } from '../widgets/cloud-sketchbook/cloud-sketchbook-tree-widget';
+import { SketchbookWidget } from '../widgets/sketchbook/sketchbook-widget';
+import { SketchbookWidgetContribution } from '../widgets/sketchbook/sketchbook-widget-contribution';
+import { SketchContribution } from './contribution';
+
+export function sketchAlreadyExists(input: string): string {
+  return nls.localize(
+    'arduino/cloudSketch/alreadyExists',
+    "Cloud sketch '{0}' already exists.",
+    input
+  );
+}
+export function sketchNotFound(input: string): string {
+  return nls.localize(
+    'arduino/cloudSketch/notFound',
+    "Could not pull the cloud sketch '{0}'. It does not exist.",
+    input
+  );
+}
+export const synchronizingSketchbook = nls.localize(
+  'arduino/cloudSketch/synchronizingSketchbook',
+  'Synchronizing sketchbook...'
+);
+export function pullingSketch(input: string): string {
+  return nls.localize(
+    'arduino/cloudSketch/pulling',
+    "Synchronizing sketchbook, pulling '{0}'...",
+    input
+  );
+}
+export function pushingSketch(input: string): string {
+  return nls.localize(
+    'arduino/cloudSketch/pushing',
+    "Synchronizing sketchbook, pushing '{0}'...",
+    input
+  );
+}
+
+@injectable()
+export abstract class CloudSketchContribution extends SketchContribution {
+  @inject(SketchbookWidgetContribution)
+  private readonly widgetContribution: SketchbookWidgetContribution;
+  @inject(CreateApi)
+  protected readonly createApi: CreateApi;
+  @inject(CreateFeatures)
+  protected readonly createFeatures: CreateFeatures;
+
+  protected async treeModel(): Promise<
+    (CloudSketchbookTreeModel & { root: CompositeTreeNode }) | undefined
+  > {
+    const { enabled, session } = this.createFeatures;
+    if (enabled && session) {
+      const widget = await this.widgetContribution.widget;
+      const treeModel = this.treeModelFrom(widget);
+      if (treeModel) {
+        const root = treeModel.root;
+        if (CompositeTreeNode.is(root)) {
+          return treeModel as CloudSketchbookTreeModel & {
+            root: CompositeTreeNode;
+          };
+        }
+      }
+    }
+    return undefined;
+  }
+
+  protected async pull(
+    sketch: Create.Sketch
+  ): Promise<CloudSketchbookTree.CloudSketchDirNode | undefined> {
+    const treeModel = await this.treeModel();
+    if (!treeModel) {
+      return undefined;
+    }
+    const id = CreateUri.toUri(sketch).path.toString();
+    const node = treeModel.getNode(id);
+    if (!node) {
+      throw new Error(
+        `Could not find cloud sketchbook tree node with ID: ${id}.`
+      );
+    }
+    if (!CloudSketchbookTree.CloudSketchDirNode.is(node)) {
+      throw new Error(
+        `Cloud sketchbook tree node expected to represent a directory but it did not. Tree node ID: ${id}.`
+      );
+    }
+    try {
+      await treeModel.sketchbookTree().pull({ node }, true);
+      return node;
+    } catch (err) {
+      if (isNotFound(err)) {
+        await treeModel.refresh();
+        this.messageService.error(sketchNotFound(sketch.name));
+        return undefined;
+      }
+      throw err;
+    }
+  }
+
+  private treeModelFrom(
+    widget: SketchbookWidget
+  ): CloudSketchbookTreeModel | undefined {
+    for (const treeWidget of widget.getTreeWidgets()) {
+      if (treeWidget instanceof CloudSketchbookTreeWidget) {
+        const model = treeWidget.model;
+        if (model instanceof CloudSketchbookTreeModel) {
+          return model;
+        }
+      }
+    }
+    return undefined;
+  }
+}

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

@@ -4,11 +4,13 @@ import {
   Disposable,
   DisposableCollection,
   Emitter,
+  MaybeArray,
   MaybePromise,
   nls,
   notEmpty,
 } from '@theia/core';
 import { ApplicationShell, FrontendApplication } from '@theia/core/lib/browser';
+import { ITextModel } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
 import URI from '@theia/core/lib/common/uri';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import {
@@ -28,14 +30,15 @@ import * as monaco from '@theia/monaco-editor-core';
 import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
 import { MonacoToProtocolConverter } from '@theia/monaco/lib/browser/monaco-to-protocol-converter';
 import { ProtocolToMonacoConverter } from '@theia/monaco/lib/browser/protocol-to-monaco-converter';
+import { OutputUri } from '@theia/output/lib/common/output-uri';
 import { CoreError } from '../../common/protocol/core-service';
 import { ErrorRevealStrategy } from '../arduino-preferences';
-import { InoSelector } from '../ino-selectors';
-import { fullRange } from '../utils/monaco';
+import { ArduinoOutputSelector, InoSelector } from '../selectors';
 import { Contribution } from './contribution';
 import { CoreErrorHandler } from './core-error-handler';
+import { MonacoEditorModel } from '@theia/monaco/lib/browser/monaco-editor-model';
 
-interface ErrorDecoration {
+interface ErrorDecorationRef {
   /**
    * This is the unique ID of the decoration given by `monaco`.
    */
@@ -45,72 +48,89 @@ interface ErrorDecoration {
    */
   readonly uri: string;
 }
-namespace ErrorDecoration {
-  export function rangeOf(
-    { id, uri }: ErrorDecoration,
-    editorProvider: (uri: string) => Promise<MonacoEditor | undefined>
-  ): Promise<monaco.Range | undefined>;
-  export function rangeOf(
-    { id, uri }: ErrorDecoration,
-    editorProvider: MonacoEditor
-  ): monaco.Range | undefined;
-  export function rangeOf(
-    { id, uri }: ErrorDecoration,
-    editorProvider:
-      | ((uri: string) => Promise<MonacoEditor | undefined>)
-      | MonacoEditor
-  ): MaybePromise<monaco.Range | undefined> {
-    if (editorProvider instanceof MonacoEditor) {
-      const control = editorProvider.getControl();
-      const model = control.getModel();
-      if (model) {
-        return control
-          .getDecorationsInRange(fullRange(model))
-          ?.find(({ id: candidateId }) => id === candidateId)?.range;
-      }
-      return undefined;
+export namespace ErrorDecorationRef {
+  export function is(arg: unknown): arg is ErrorDecorationRef {
+    if (typeof arg === 'object') {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      const object = arg as any;
+      return (
+        'uri' in object &&
+        typeof object['uri'] === 'string' &&
+        'id' in object &&
+        typeof object['id'] === 'string'
+      );
     }
-    return editorProvider(uri).then((editor) => {
-      if (editor) {
-        return rangeOf({ id, uri }, editor);
-      }
-      return undefined;
-    });
+    return false;
   }
-
-  // export async function rangeOf(
-  //   { id, uri }: ErrorDecoration,
-  //   editorProvider:
-  //     | ((uri: string) => Promise<MonacoEditor | undefined>)
-  //     | MonacoEditor
-  // ): Promise<monaco.Range | undefined> {
-  //   const editor =
-  //     editorProvider instanceof MonacoEditor
-  //       ? editorProvider
-  //       : await editorProvider(uri);
-  //   if (editor) {
-  //     const control = editor.getControl();
-  //     const model = control.getModel();
-  //     if (model) {
-  //       return control
-  //         .getDecorationsInRange(fullRange(model))
-  //         ?.find(({ id: candidateId }) => id === candidateId)?.range;
-  //     }
-  //   }
-  //   return undefined;
-  // }
   export function sameAs(
-    left: ErrorDecoration,
-    right: ErrorDecoration
+    left: ErrorDecorationRef,
+    right: ErrorDecorationRef
   ): boolean {
     return left.id === right.id && left.uri === right.uri;
   }
 }
 
+interface ErrorDecoration extends ErrorDecorationRef {
+  /**
+   * The range of the error location the error in the compiler output from the CLI.
+   */
+  readonly rangesInOutput: monaco.Range[];
+}
+namespace ErrorDecoration {
+  export function rangeOf(
+    editorOrModel: MonacoEditor | ITextModel | undefined,
+    decorations: ErrorDecoration
+  ): monaco.Range | undefined;
+  export function rangeOf(
+    editorOrModel: MonacoEditor | ITextModel | undefined,
+    decorations: ErrorDecoration[]
+  ): (monaco.Range | undefined)[];
+  export function rangeOf(
+    editorOrModel: MonacoEditor | ITextModel | undefined,
+    decorations: ErrorDecoration | ErrorDecoration[]
+  ): MaybePromise<MaybeArray<monaco.Range | undefined>> {
+    if (editorOrModel) {
+      const allDecorations = getAllDecorations(editorOrModel);
+      if (allDecorations) {
+        if (Array.isArray(decorations)) {
+          return decorations.map(({ id: decorationId }) =>
+            findRangeOf(decorationId, allDecorations)
+          );
+        } else {
+          return findRangeOf(decorations.id, allDecorations);
+        }
+      }
+    }
+    return Array.isArray(decorations)
+      ? decorations.map(() => undefined)
+      : undefined;
+  }
+  function findRangeOf(
+    decorationId: string,
+    allDecorations: { id: string; range?: monaco.Range }[]
+  ): monaco.Range | undefined {
+    return allDecorations.find(
+      ({ id: candidateId }) => candidateId === decorationId
+    )?.range;
+  }
+  function getAllDecorations(
+    editorOrModel: MonacoEditor | ITextModel
+  ): { id: string; range?: monaco.Range }[] {
+    if (editorOrModel instanceof MonacoEditor) {
+      const model = editorOrModel.getControl().getModel();
+      if (!model) {
+        return [];
+      }
+      return model.getAllDecorations();
+    }
+    return editorOrModel.getAllDecorations();
+  }
+}
+
 @injectable()
 export class CompilerErrors
   extends Contribution
-  implements monaco.languages.CodeLensProvider
+  implements monaco.languages.CodeLensProvider, monaco.languages.LinkProvider
 {
   @inject(EditorManager)
   private readonly editorManager: EditorManager;
@@ -119,11 +139,14 @@ export class CompilerErrors
   private readonly p2m: ProtocolToMonacoConverter;
 
   @inject(MonacoToProtocolConverter)
-  private readonly mp2: MonacoToProtocolConverter;
+  private readonly m2p: MonacoToProtocolConverter;
 
   @inject(CoreErrorHandler)
   private readonly coreErrorHandler: CoreErrorHandler;
 
+  private revealStrategy = ErrorRevealStrategy.Default;
+  private experimental = false;
+
   private readonly errors: ErrorDecoration[] = [];
   private readonly onDidChangeEmitter = new monaco.Emitter<this>();
   private readonly currentErrorDidChangEmitter = new Emitter<ErrorDecoration>();
@@ -131,8 +154,8 @@ export class CompilerErrors
     this.currentErrorDidChangEmitter.event;
   private readonly toDisposeOnCompilerErrorDidChange =
     new DisposableCollection();
+
   private shell: ApplicationShell | undefined;
-  private revealStrategy = ErrorRevealStrategy.Default;
   private currentError: ErrorDecoration | undefined;
   private get currentErrorIndex(): number {
     const current = this.currentError;
@@ -140,46 +163,75 @@ export class CompilerErrors
       return -1;
     }
     return this.errors.findIndex((error) =>
-      ErrorDecoration.sameAs(error, current)
+      ErrorDecorationRef.sameAs(error, current)
     );
   }
 
   override onStart(app: FrontendApplication): void {
     this.shell = app.shell;
     monaco.languages.registerCodeLensProvider(InoSelector, this);
+    monaco.languages.registerLinkProvider(ArduinoOutputSelector, this);
     this.coreErrorHandler.onCompilerErrorsDidChange((errors) =>
-      this.filter(errors).then(this.handleCompilerErrorsDidChange.bind(this))
+      this.handleCompilerErrorsDidChange(errors)
     );
     this.onCurrentErrorDidChange(async (error) => {
-      const range = await ErrorDecoration.rangeOf(error, (uri) =>
-        this.monacoEditor(uri)
-      );
-      if (!range) {
+      const monacoEditor = await this.monacoEditor(error.uri);
+      const monacoRange = ErrorDecoration.rangeOf(monacoEditor, error);
+      if (!monacoRange) {
         console.warn(
           'compiler-errors',
           `Could not find range of decoration: ${error.id}`
         );
         return;
       }
+      const range = this.m2p.asRange(monacoRange);
       const editor = await this.revealLocationInEditor({
         uri: error.uri,
-        range: this.mp2.asRange(range),
+        range,
       });
       if (!editor) {
         console.warn(
           'compiler-errors',
           `Failed to mark error ${error.id} as the current one.`
         );
+      } else {
+        const monacoEditor = this.monacoEditor(editor);
+        if (monacoEditor) {
+          monacoEditor.cursor = range.start;
+        }
       }
     });
+  }
+
+  override onReady(): MaybePromise<void> {
     this.preferences.ready.then(() => {
-      this.preferences.onPreferenceChanged(({ preferenceName, newValue }) => {
-        if (preferenceName === 'arduino.compile.revealRange') {
-          this.revealStrategy = ErrorRevealStrategy.is(newValue)
-            ? newValue
-            : ErrorRevealStrategy.Default;
+      this.experimental = Boolean(
+        this.preferences['arduino.compile.experimental']
+      );
+      const strategy = this.preferences['arduino.compile.revealRange'];
+      this.revealStrategy = ErrorRevealStrategy.is(strategy)
+        ? strategy
+        : ErrorRevealStrategy.Default;
+      this.preferences.onPreferenceChanged(
+        ({ preferenceName, newValue, oldValue }) => {
+          if (newValue === oldValue) {
+            return;
+          }
+          switch (preferenceName) {
+            case 'arduino.compile.revealRange': {
+              this.revealStrategy = ErrorRevealStrategy.is(newValue)
+                ? newValue
+                : ErrorRevealStrategy.Default;
+              return;
+            }
+            case 'arduino.compile.experimental': {
+              this.experimental = Boolean(newValue);
+              this.onDidChangeEmitter.fire(this);
+              return;
+            }
+          }
         }
-      });
+      );
     });
   }
 
@@ -196,9 +248,13 @@ export class CompilerErrors
         }
         const nextError =
           this.errors[index === this.errors.length - 1 ? 0 : index + 1];
-        this.markAsCurrentError(nextError);
+        return this.markAsCurrentError(nextError, {
+          forceReselect: true,
+          reveal: true,
+        });
       },
-      isEnabled: () => !!this.currentError && this.errors.length > 1,
+      isEnabled: () =>
+        this.experimental && !!this.currentError && this.errors.length > 1,
     });
     registry.registerCommand(CompilerErrors.Commands.PREVIOUS_ERROR, {
       execute: () => {
@@ -212,9 +268,24 @@ export class CompilerErrors
         }
         const previousError =
           this.errors[index === 0 ? this.errors.length - 1 : index - 1];
-        this.markAsCurrentError(previousError);
+        return this.markAsCurrentError(previousError, {
+          forceReselect: true,
+          reveal: true,
+        });
       },
-      isEnabled: () => !!this.currentError && this.errors.length > 1,
+      isEnabled: () =>
+        this.experimental && !!this.currentError && this.errors.length > 1,
+    });
+    registry.registerCommand(CompilerErrors.Commands.MARK_AS_CURRENT, {
+      execute: (arg: unknown) => {
+        if (ErrorDecorationRef.is(arg)) {
+          return this.markAsCurrentError(
+            { id: arg.id, uri: new URI(arg.uri).toString() }, // Make sure the URI fragments are encoded. On Windows, `C:` is encoded as `C%3A`.
+            { forceReselect: true, reveal: true }
+          );
+        }
+      },
+      isEnabled: () => !!this.errors.length,
     });
   }
 
@@ -229,13 +300,13 @@ export class CompilerErrors
   ): Promise<monaco.languages.CodeLensList> {
     const lenses: monaco.languages.CodeLens[] = [];
     if (
+      this.experimental &&
       this.currentError &&
       this.currentError.uri === model.uri.toString() &&
       this.errors.length > 1
     ) {
-      const range = await ErrorDecoration.rangeOf(this.currentError, (uri) =>
-        this.monacoEditor(uri)
-      );
+      const monacoEditor = await this.monacoEditor(model.uri);
+      const range = ErrorDecoration.rangeOf(monacoEditor, this.currentError);
       if (range) {
         lenses.push(
           {
@@ -268,14 +339,81 @@ export class CompilerErrors
     };
   }
 
+  async provideLinks(
+    model: monaco.editor.ITextModel,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _token: monaco.CancellationToken
+  ): Promise<monaco.languages.ILinksList> {
+    const links: monaco.languages.ILink[] = [];
+    if (
+      model.uri.scheme === OutputUri.SCHEME &&
+      model.uri.path === '/Arduino'
+    ) {
+      links.push(
+        ...this.errors
+          .filter((decoration) => !!decoration.rangesInOutput.length)
+          .map(({ rangesInOutput, id, uri }) =>
+            rangesInOutput.map(
+              (range) =>
+                <monaco.languages.ILink>{
+                  range,
+                  url: monaco.Uri.parse(`command://`).with({
+                    query: JSON.stringify({ id, uri }),
+                    path: CompilerErrors.Commands.MARK_AS_CURRENT.id,
+                  }),
+                  tooltip: nls.localize(
+                    'arduino/editor/revealError',
+                    'Reveal Error'
+                  ),
+                }
+            )
+          )
+          .reduce((acc, curr) => acc.concat(curr), [])
+      );
+    } else {
+      console.warn('unexpected URI: ' + model.uri.toString());
+    }
+    return { links };
+  }
+
+  async resolveLink(
+    link: monaco.languages.ILink,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _token: monaco.CancellationToken
+  ): Promise<monaco.languages.ILink | undefined> {
+    if (!this.experimental) {
+      return undefined;
+    }
+    const { url } = link;
+    if (url) {
+      const candidateUri = new URI(
+        typeof url === 'string' ? url : url.toString()
+      );
+      const candidateId = candidateUri.path.toString();
+      const error = this.errors.find((error) => error.id === candidateId);
+      if (error) {
+        const monacoEditor = await this.monacoEditor(error.uri);
+        const range = ErrorDecoration.rangeOf(monacoEditor, error);
+        if (range) {
+          return {
+            range,
+            url: monaco.Uri.parse(error.uri),
+          };
+        }
+      }
+    }
+    return undefined;
+  }
+
   private async handleCompilerErrorsDidChange(
     errors: CoreError.ErrorLocation[]
   ): Promise<void> {
     this.toDisposeOnCompilerErrorDidChange.dispose();
-    const compilerErrorsPerResource = this.groupByResource(
-      await this.filter(errors)
+    const groupedErrors = this.groupBy(
+      errors,
+      (error: CoreError.ErrorLocation) => error.location.uri
     );
-    const decorations = await this.decorateEditors(compilerErrorsPerResource);
+    const decorations = await this.decorateEditors(groupedErrors);
     this.errors.push(...decorations.errors);
     this.toDisposeOnCompilerErrorDidChange.pushAll([
       Disposable.create(() => (this.errors.length = 0)),
@@ -283,17 +421,17 @@ export class CompilerErrors
       ...(await Promise.all([
         decorations.dispose,
         this.trackEditors(
-          compilerErrorsPerResource,
+          groupedErrors,
           (editor) =>
-            editor.editor.onSelectionChanged((selection) =>
+            editor.onSelectionChanged((selection) =>
               this.handleSelectionChange(editor, selection)
             ),
           (editor) =>
-            editor.onDidDispose(() =>
-              this.handleEditorDidDispose(editor.editor.uri.toString())
+            editor.onDispose(() =>
+              this.handleEditorDidDispose(editor.uri.toString())
             ),
           (editor) =>
-            editor.editor.onDocumentContentChanged((event) =>
+            editor.onDocumentContentChanged((event) =>
               this.handleDocumentContentChange(editor, event)
             )
         ),
@@ -301,24 +439,13 @@ export class CompilerErrors
     ]);
     const currentError = this.errors[0];
     if (currentError) {
-      await this.markAsCurrentError(currentError);
+      await this.markAsCurrentError(currentError, {
+        forceReselect: true,
+        reveal: true,
+      });
     }
   }
 
-  private async filter(
-    errors: CoreError.ErrorLocation[]
-  ): Promise<CoreError.ErrorLocation[]> {
-    if (!errors.length) {
-      return [];
-    }
-    await this.preferences.ready;
-    if (this.preferences['arduino.compile.experimental']) {
-      return errors;
-    }
-    // Always shows maximum one error; hence the code lens navigation is unavailable.
-    return [errors[0]];
-  }
-
   private async decorateEditors(
     errors: Map<string, CoreError.ErrorLocation[]>
   ): Promise<{ dispose: Disposable; errors: ErrorDecoration[] }> {
@@ -342,11 +469,11 @@ export class CompilerErrors
     uri: string,
     errors: CoreError.ErrorLocation[]
   ): Promise<{ dispose: Disposable; errors: ErrorDecoration[] }> {
-    const editor = await this.editorManager.getByUri(new URI(uri));
+    const editor = await this.monacoEditor(uri);
     if (!editor) {
       return { dispose: Disposable.NULL, errors: [] };
     }
-    const oldDecorations = editor.editor.deltaDecorations({
+    const oldDecorations = editor.deltaDecorations({
       oldDecorations: [],
       newDecorations: errors.map((error) =>
         this.compilerErrorDecoration(error.location.range)
@@ -355,13 +482,19 @@ export class CompilerErrors
     return {
       dispose: Disposable.create(() => {
         if (editor) {
-          editor.editor.deltaDecorations({
+          editor.deltaDecorations({
             oldDecorations,
             newDecorations: [],
           });
         }
       }),
-      errors: oldDecorations.map((id) => ({ id, uri })),
+      errors: oldDecorations.map((id, index) => ({
+        id,
+        uri,
+        rangesInOutput: errors[index].rangesInOutput.map((range) =>
+          this.p2m.asRange(range)
+        ),
+      })),
     };
   }
 
@@ -371,7 +504,7 @@ export class CompilerErrors
       options: {
         isWholeLine: true,
         className: 'compiler-error',
-        stickiness: TrackedRangeStickiness.AlwaysGrowsWhenTypingAtEdges,
+        stickiness: TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
       },
     };
   }
@@ -379,11 +512,10 @@ export class CompilerErrors
   /**
    * Tracks the selection in all editors that have an error. If the editor selection overlaps one of the compiler error's range, mark as current error.
    */
-  private handleSelectionChange(editor: EditorWidget, selection: Range): void {
-    const monacoEditor = this.monacoEditor(editor);
-    if (!monacoEditor) {
-      return;
-    }
+  private handleSelectionChange(
+    monacoEditor: MonacoEditor,
+    selection: Range
+  ): void {
     const uri = monacoEditor.uri.toString();
     const monacoSelection = this.p2m.asRange(selection);
     console.log(
@@ -418,12 +550,13 @@ export class CompilerErrors
       console.trace('No match');
       return undefined;
     };
-    const error = this.errors
-      .filter((error) => error.uri === uri)
-      .map((error) => ({
-        error,
-        range: ErrorDecoration.rangeOf(error, monacoEditor),
-      }))
+    const errorsPerResource = this.errors.filter((error) => error.uri === uri);
+    const rangesPerResource = ErrorDecoration.rangeOf(
+      monacoEditor,
+      errorsPerResource
+    );
+    const error = rangesPerResource
+      .map((range, index) => ({ error: errorsPerResource[index], range }))
       .map(({ error, range }) => {
         if (range) {
           const priority = calculatePriority(range, monacoSelection);
@@ -464,66 +597,77 @@ export class CompilerErrors
   }
 
   /**
-   * If a document change "destroys" the range of the decoration, the decoration must be removed.
+   * If the text document changes in the line where compiler errors are, the compiler errors will be removed.
    */
   private handleDocumentContentChange(
-    editor: EditorWidget,
+    monacoEditor: MonacoEditor,
     event: TextDocumentChangeEvent
   ): void {
-    const monacoEditor = this.monacoEditor(editor);
-    if (!monacoEditor) {
-      return;
-    }
-    // A decoration location can be "destroyed", hence should be deleted when:
-    // - deleting range (start != end AND text is empty)
-    // - inserting text into range (start != end AND text is not empty)
-    // Filter unrelated delta changes to spare the CPU.
-    const relevantChanges = event.contentChanges.filter(
-      ({ range: { start, end } }) =>
-        start.line !== end.line || start.character !== end.character
+    const errorsPerResource = this.errors.filter(
+      (error) => error.uri === event.document.uri
     );
-    if (!relevantChanges.length) {
-      return;
+    let editorOrModel: MonacoEditor | ITextModel = monacoEditor;
+    const doc = event.document;
+    if (doc instanceof MonacoEditorModel) {
+      editorOrModel = doc.textEditorModel;
     }
-
-    const resolvedMarkers = this.errors
-      .filter((error) => error.uri === event.document.uri)
-      .map((error, index) => {
-        const range = ErrorDecoration.rangeOf(error, monacoEditor);
-        if (range) {
-          return { error, range, index };
-        }
-        return undefined;
-      })
-      .filter(notEmpty);
-
-    const decorationIdsToRemove = relevantChanges
+    const rangesPerResource = ErrorDecoration.rangeOf(
+      editorOrModel,
+      errorsPerResource
+    );
+    const resolvedDecorations = rangesPerResource.map((range, index) => ({
+      error: errorsPerResource[index],
+      range,
+    }));
+    const decoratorsToRemove = event.contentChanges
       .map(({ range }) => this.p2m.asRange(range))
-      .map((changeRange) =>
-        resolvedMarkers.filter(({ range: decorationRange }) =>
-          changeRange.containsRange(decorationRange)
-        )
+      .map((changedRange) =>
+        resolvedDecorations
+          .filter(({ range: decorationRange }) => {
+            if (!decorationRange) {
+              return false;
+            }
+            const affects =
+              changedRange.startLineNumber <= decorationRange.startLineNumber &&
+              changedRange.endLineNumber >= decorationRange.endLineNumber;
+            console.log(
+              'compiler-errors',
+              `decoration range: ${decorationRange.toString()}, change range: ${changedRange.toString()}, affects: ${affects}`
+            );
+            return affects;
+          })
+          .map(({ error }) => {
+            const index = this.errors.findIndex((candidate) =>
+              ErrorDecorationRef.sameAs(candidate, error)
+            );
+            return index !== -1 ? { error, index } : undefined;
+          })
+          .filter(notEmpty)
       )
       .reduce((acc, curr) => acc.concat(curr), [])
-      .map(({ error, index }) => {
-        this.errors.splice(index, 1);
-        return error.id;
-      });
-    if (!decorationIdsToRemove.length) {
-      return;
+      .sort((left, right) => left.index - right.index); // highest index last
+
+    if (decoratorsToRemove.length) {
+      let i = decoratorsToRemove.length;
+      while (i--) {
+        this.errors.splice(decoratorsToRemove[i].index, 1);
+      }
+      monacoEditor.getControl().deltaDecorations(
+        decoratorsToRemove.map(({ error }) => error.id),
+        []
+      );
+      this.onDidChangeEmitter.fire(this);
     }
-    monacoEditor.getControl().deltaDecorations(decorationIdsToRemove, []);
-    this.onDidChangeEmitter.fire(this);
   }
 
   private async trackEditors(
     errors: Map<string, CoreError.ErrorLocation[]>,
-    ...track: ((editor: EditorWidget) => Disposable)[]
+    ...track: ((editor: MonacoEditor) => Disposable)[]
   ): Promise<Disposable> {
     return new DisposableCollection(
       ...(await Promise.all(
         Array.from(errors.keys()).map(async (uri) => {
-          const editor = await this.editorManager.getByUri(new URI(uri));
+          const editor = await this.monacoEditor(uri);
           if (!editor) {
             return Disposable.NULL;
           }
@@ -533,15 +677,18 @@ export class CompilerErrors
     );
   }
 
-  private async markAsCurrentError(error: ErrorDecoration): Promise<void> {
+  private async markAsCurrentError(
+    ref: ErrorDecorationRef,
+    options?: { forceReselect?: boolean; reveal?: boolean }
+  ): Promise<void> {
     const index = this.errors.findIndex((candidate) =>
-      ErrorDecoration.sameAs(candidate, error)
+      ErrorDecorationRef.sameAs(candidate, ref)
     );
     if (index < 0) {
       console.warn(
         'compiler-errors',
         `Failed to mark error ${
-          error.id
+          ref.id
         } as the current one. Error is unknown. Known errors are: ${this.errors.map(
           ({ id }) => id
         )}`
@@ -550,15 +697,18 @@ export class CompilerErrors
     }
     const newError = this.errors[index];
     if (
+      options?.forceReselect ||
       !this.currentError ||
-      !ErrorDecoration.sameAs(this.currentError, newError)
+      !ErrorDecorationRef.sameAs(this.currentError, newError)
     ) {
       this.currentError = this.errors[index];
       console.log(
         'compiler-errors',
         `Current error changed to ${this.currentError.id}`
       );
-      this.currentErrorDidChangEmitter.fire(this.currentError);
+      if (options?.reveal) {
+        this.currentErrorDidChangEmitter.fire(this.currentError);
+      }
       this.onDidChangeEmitter.fire(this);
     }
   }
@@ -593,32 +743,33 @@ export class CompilerErrors
     }
     console.warn(
       'compiler-errors',
-      `could not found editor widget for URI: ${uri}`
+      `could not find editor widget for URI: ${uri}`
     );
     return undefined;
   }
 
-  private groupByResource(
-    errors: CoreError.ErrorLocation[]
-  ): Map<string, CoreError.ErrorLocation[]> {
-    return errors.reduce((acc, curr) => {
-      const {
-        location: { uri },
-      } = curr;
-      let errors = acc.get(uri);
-      if (!errors) {
-        errors = [];
-        acc.set(uri, errors);
+  private groupBy<K, V>(
+    elements: V[],
+    extractKey: (element: V) => K
+  ): Map<K, V[]> {
+    return elements.reduce((acc, curr) => {
+      const key = extractKey(curr);
+      let values = acc.get(key);
+      if (!values) {
+        values = [];
+        acc.set(key, values);
       }
-      errors.push(curr);
+      values.push(curr);
       return acc;
-    }, new Map<string, CoreError.ErrorLocation[]>());
+    }, new Map<K, V[]>());
   }
 
   private monacoEditor(widget: EditorWidget): MonacoEditor | undefined;
-  private monacoEditor(uri: string): Promise<MonacoEditor | undefined>;
   private monacoEditor(
-    uriOrWidget: string | EditorWidget
+    uri: string | monaco.Uri
+  ): Promise<MonacoEditor | undefined>;
+  private monacoEditor(
+    uriOrWidget: string | monaco.Uri | EditorWidget
   ): MaybePromise<MonacoEditor | undefined> {
     if (uriOrWidget instanceof EditorWidget) {
       const editor = uriOrWidget.editor;
@@ -628,7 +779,7 @@ export class CompilerErrors
       return undefined;
     } else {
       return this.editorManager
-        .getByUri(new URI(uriOrWidget))
+        .getByUri(new URI(uriOrWidget.toString()))
         .then((editor) => {
           if (editor) {
             return this.monacoEditor(editor);
@@ -646,5 +797,8 @@ export namespace CompilerErrors {
     export const PREVIOUS_ERROR: Command = {
       id: 'arduino-editor-previous-error',
     };
+    export const MARK_AS_CURRENT: Command = {
+      id: 'arduino-editor-mark-as-current-error',
+    };
   }
 }

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

@@ -1,73 +1,87 @@
+import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
+import { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import {
+  KeybindingContribution,
+  KeybindingRegistry,
+} from '@theia/core/lib/browser/keybinding';
+import { LabelProvider } from '@theia/core/lib/browser/label-provider';
+import { OpenerService, open } from '@theia/core/lib/browser/opener-service';
+import { Saveable } from '@theia/core/lib/browser/saveable';
+import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
+import {
+  TabBarToolbarContribution,
+  TabBarToolbarRegistry,
+} from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import { CancellationToken } from '@theia/core/lib/common/cancellation';
+import {
+  Command,
+  CommandContribution,
+  CommandRegistry,
+  CommandService,
+} from '@theia/core/lib/common/command';
+import {
+  Disposable,
+  DisposableCollection,
+} from '@theia/core/lib/common/disposable';
+import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
+import { ILogger } from '@theia/core/lib/common/logger';
+import {
+  MenuContribution,
+  MenuModelRegistry,
+} from '@theia/core/lib/common/menu';
+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 { MaybePromise, isObject } from '@theia/core/lib/common/types';
+import URI from '@theia/core/lib/common/uri';
 import {
   inject,
   injectable,
   interfaces,
   postConstruct,
 } from '@theia/core/shared/inversify';
-import URI from '@theia/core/lib/common/uri';
-import { ILogger } from '@theia/core/lib/common/logger';
-import { Saveable } from '@theia/core/lib/browser/saveable';
-import { FileService } from '@theia/filesystem/lib/browser/file-service';
-import { MaybePromise } from '@theia/core/lib/common/types';
-import { LabelProvider } from '@theia/core/lib/browser/label-provider';
 import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
-import { MessageService } from '@theia/core/lib/common/message-service';
-import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
-import { open, OpenerService } from '@theia/core/lib/browser/opener-service';
-
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { NotificationManager } from '@theia/messages/lib/browser/notifications-manager';
+import { OutputChannelSeverity } from '@theia/output/lib/browser/output-channel';
+import { MainMenuManager } from '../../common/main-menu-manager';
+import { userAbort } from '../../common/nls';
 import {
-  MenuModelRegistry,
-  MenuContribution,
-} from '@theia/core/lib/common/menu';
+  CoreError,
+  CoreService,
+  FileSystemExt,
+  ResponseServiceClient,
+  Sketch,
+  SketchesService,
+} from '../../common/protocol';
 import {
-  KeybindingRegistry,
-  KeybindingContribution,
-} from '@theia/core/lib/browser/keybinding';
-import {
-  TabBarToolbarContribution,
-  TabBarToolbarRegistry,
-} from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import {
-  FrontendApplicationContribution,
-  FrontendApplication,
-} from '@theia/core/lib/browser/frontend-application';
-import {
-  Command,
-  CommandRegistry,
-  CommandContribution,
-  CommandService,
-} from '@theia/core/lib/common/command';
+  ExecuteWithProgress,
+  UserAbortApplicationError,
+} from '../../common/protocol/progressible';
+import { ArduinoPreferences } from '../arduino-preferences';
+import { BoardsDataStore } from '../boards/boards-data-store';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import { ConfigServiceClient } from '../config/config-service-client';
+import { DialogService } from '../dialog-service';
 import { SettingsService } from '../dialogs/settings/settings';
 import {
   CurrentSketch,
   SketchesServiceClientImpl,
-} from '../../common/protocol/sketches-service-client-impl';
-import {
-  SketchesService,
-  ConfigService,
-  FileSystemExt,
-  Sketch,
-  CoreService,
-  CoreError,
-  ResponseServiceClient,
-} from '../../common/protocol';
-import { ArduinoPreferences } from '../arduino-preferences';
-import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
-import { nls } from '@theia/core';
+} from '../sketches-service-client-impl';
+import { ApplicationConnectionStatusContribution } from '../theia/core/connection-status-service';
 import { OutputChannelManager } from '../theia/output/output-channel';
-import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
-import { ExecuteWithProgress } from '../../common/protocol/progressible';
-import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import { BoardsDataStore } from '../boards/boards-data-store';
+import { WorkspaceService } from '../theia/workspace/workspace-service';
 
 export {
   Command,
   CommandRegistry,
-  MenuModelRegistry,
   KeybindingRegistry,
+  MenuModelRegistry,
+  Sketch,
   TabBarToolbarRegistry,
   URI,
-  Sketch,
   open,
 };
 
@@ -104,6 +118,12 @@ export abstract class Contribution
   @inject(FrontendApplicationStateService)
   protected readonly appStateService: FrontendApplicationStateService;
 
+  @inject(MainMenuManager)
+  protected readonly menuManager: MainMenuManager;
+
+  @inject(DialogService)
+  protected readonly dialogService: DialogService;
+
   @postConstruct()
   protected init(): void {
     this.appStateService.reachedState('ready').then(() => this.onReady());
@@ -136,11 +156,11 @@ export abstract class SketchContribution extends Contribution {
   @inject(FileSystemExt)
   protected readonly fileSystemExt: FileSystemExt;
 
-  @inject(ConfigService)
-  protected readonly configService: ConfigService;
+  @inject(ConfigServiceClient)
+  protected readonly configService: ConfigServiceClient;
 
   @inject(SketchesService)
-  protected readonly sketchService: SketchesService;
+  protected readonly sketchesService: SketchesService;
 
   @inject(OpenerService)
   protected readonly openerService: OpenerService;
@@ -154,6 +174,12 @@ export abstract class SketchContribution extends Contribution {
   @inject(OutputChannelManager)
   protected readonly outputChannelManager: OutputChannelManager;
 
+  @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();
@@ -167,6 +193,25 @@ export abstract class SketchContribution extends Contribution {
     }
     return override;
   }
+
+  /**
+   * Defaults to `directories.user` if defined and not CLI config errors were detected.
+   * Otherwise, the URI of the user home directory.
+   */
+  protected async defaultUri(): Promise<URI> {
+    const errors = this.configService.tryGetMessages();
+    let defaultUri = this.configService.tryGetSketchDirUri();
+    if (!defaultUri || errors?.length) {
+      // Fall back to user home when the `directories.user` is not available or there are known CLI config errors
+      defaultUri = new URI(await this.envVariableServer.getHomeDirUri());
+    }
+    return defaultUri;
+  }
+
+  protected async defaultPath(): Promise<string> {
+    const defaultUri = await this.defaultUri();
+    return this.fileService.fsPath(defaultUri);
+  }
 }
 
 @injectable()
@@ -186,7 +231,32 @@ export abstract class CoreServiceContribution extends SketchContribution {
   @inject(ResponseServiceClient)
   private readonly responseService: ResponseServiceClient;
 
+  @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.)
+   */
+  private visibleNotificationId: string | undefined;
+
+  protected clearVisibleNotification(): void {
+    if (this.visibleNotificationId) {
+      this.notificationManager.clear(this.visibleNotificationId);
+      this.visibleNotificationId = undefined;
+    }
+  }
+
   protected handleError(error: unknown): void {
+    if (isObject(error) && UserAbortApplicationError.is(error)) {
+      this.outputChannelManager
+        .getChannel('Arduino')
+        .appendLine(userAbort, OutputChannelSeverity.Warning);
+      return;
+    }
     this.tryToastErrorMessage(error);
   }
 
@@ -204,10 +274,17 @@ export abstract class CoreServiceContribution extends SketchContribution {
       } catch {}
     }
     if (message) {
+      if (message.includes('Missing FQBN (Fully Qualified Board Name)')) {
+        message = nls.localize(
+          'arduino/coreContribution/noBoardSelected',
+          'No board selected. Please select your Arduino board from the Tools > Board menu.'
+        );
+      }
       const copyAction = nls.localize(
         'arduino/coreContribution/copyError',
         'Copy error messages'
       );
+      this.visibleNotificationId = this.notificationId(message, copyAction);
       this.messageService.error(message, copyAction).then(async (action) => {
         if (action === copyAction) {
           const content = await this.outputChannelManager.contentOfChannel(
@@ -226,8 +303,17 @@ export abstract class CoreServiceContribution extends SketchContribution {
   protected async doWithProgress<T>(options: {
     progressText: string;
     keepOutput?: boolean;
-    task: (progressId: string, coreService: CoreService) => Promise<T>;
+    task: (
+      progressId: string,
+      coreService: CoreService,
+      cancellationToken?: CancellationToken
+    ) => Promise<T>;
+    // false by default
+    cancelable?: boolean;
   }): Promise<T> {
+    const toDisposeOnComplete = new DisposableCollection(
+      this.maybeActivateMonitorWidget()
+    );
     const { progressText, keepOutput, task } = options;
     this.outputChannelManager
       .getChannel('Arduino')
@@ -236,11 +322,36 @@ export abstract class CoreServiceContribution extends SketchContribution {
       messageService: this.messageService,
       responseService: this.responseService,
       progressText,
-      run: ({ progressId }) => task(progressId, this.coreService),
+      run: ({ progressId, cancellationToken }) =>
+        task(progressId, this.coreService, cancellationToken),
       keepOutput,
+      cancelable: options.cancelable,
     });
+    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,
+      actions,
+      type: MessageType.Error,
+    });
+  }
 }
 
 export namespace Contribution {

arduino-ide-extension/src/browser/contributions/create-cloud-copy.ts

@@ -0,0 +1,118 @@
+import { FrontendApplication } from '@theia/core/lib/browser/frontend-application';
+import { ApplicationShell } from '@theia/core/lib/browser/shell';
+import type { Command, CommandRegistry } from '@theia/core/lib/common/command';
+import { Progress } from '@theia/core/lib/common/message-service-protocol';
+import { nls } from '@theia/core/lib/common/nls';
+import { inject, injectable } from '@theia/core/shared/inversify';
+import { Create } from '../create/typings';
+import { ApplicationConnectionStatusContribution } from '../theia/core/connection-status-service';
+import { CloudSketchbookTree } from '../widgets/cloud-sketchbook/cloud-sketchbook-tree';
+import { SketchbookTree } from '../widgets/sketchbook/sketchbook-tree';
+import { SketchbookTreeModel } from '../widgets/sketchbook/sketchbook-tree-model';
+import { CloudSketchContribution, pushingSketch } from './cloud-contribution';
+import {
+  CreateNewCloudSketchCallback,
+  NewCloudSketch,
+  NewCloudSketchParams,
+} from './new-cloud-sketch';
+import { saveOntoCopiedSketch } from './save-as-sketch';
+
+interface CreateCloudCopyParams {
+  readonly model: SketchbookTreeModel;
+  readonly node: SketchbookTree.SketchDirNode;
+}
+function isCreateCloudCopyParams(arg: unknown): arg is CreateCloudCopyParams {
+  return (
+    typeof arg === 'object' &&
+    (<CreateCloudCopyParams>arg).model !== undefined &&
+    (<CreateCloudCopyParams>arg).model instanceof SketchbookTreeModel &&
+    (<CreateCloudCopyParams>arg).node !== undefined &&
+    SketchbookTree.SketchDirNode.is((<CreateCloudCopyParams>arg).node)
+  );
+}
+
+@injectable()
+export class CreateCloudCopy extends CloudSketchContribution {
+  @inject(ApplicationConnectionStatusContribution)
+  private readonly connectionStatus: ApplicationConnectionStatusContribution;
+
+  private shell: ApplicationShell;
+
+  override onStart(app: FrontendApplication): void {
+    this.shell = app.shell;
+  }
+
+  override registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(CreateCloudCopy.Commands.CREATE_CLOUD_COPY, {
+      execute: (args: CreateCloudCopyParams) => this.createCloudCopy(args),
+      isEnabled: (args: unknown) =>
+        Boolean(this.createFeatures.session) && isCreateCloudCopyParams(args),
+      isVisible: (args: unknown) =>
+        Boolean(this.createFeatures.enabled) &&
+        Boolean(this.createFeatures.session) &&
+        this.connectionStatus.offlineStatus !== 'internet' &&
+        isCreateCloudCopyParams(args),
+    });
+  }
+
+  /**
+   *  - creates new cloud sketch with the name of the params sketch,
+   *  - pulls the cloud sketch,
+   *  - copies files from params sketch to pulled cloud sketch in the cache folder,
+   *  - pushes the cloud sketch, and
+   *  - opens in new window.
+   */
+  private async createCloudCopy(params: CreateCloudCopyParams): Promise<void> {
+    const sketch = await this.sketchesService.loadSketch(
+      params.node.fileStat.resource.toString()
+    );
+    const callback: CreateNewCloudSketchCallback = async (
+      newSketch: Create.Sketch,
+      newNode: CloudSketchbookTree.CloudSketchDirNode,
+      progress: Progress
+    ) => {
+      const treeModel = await this.treeModel();
+      if (!treeModel) {
+        throw new Error('Could not retrieve the cloud sketchbook tree model.');
+      }
+
+      progress.report({
+        message: nls.localize(
+          'arduino/createCloudCopy/copyingSketchFilesMessage',
+          'Copying local sketch files...'
+        ),
+      });
+      const localCacheFolderUri = newNode.uri.toString();
+      await this.sketchesService.copy(sketch, {
+        destinationUri: localCacheFolderUri,
+        onlySketchFiles: true,
+      });
+      await saveOntoCopiedSketch(
+        sketch,
+        localCacheFolderUri,
+        this.shell,
+        this.editorManager
+      );
+
+      progress.report({ message: pushingSketch(newSketch.name) });
+      await treeModel.sketchbookTree().push(newNode, true, true);
+    };
+    return this.commandService.executeCommand(
+      NewCloudSketch.Commands.NEW_CLOUD_SKETCH.id,
+      <NewCloudSketchParams>{
+        initialValue: params.node.fileStat.name,
+        callback,
+        skipShowErrorMessageOnOpen: false,
+      }
+    );
+  }
+}
+
+export namespace CreateCloudCopy {
+  export namespace Commands {
+    export const CREATE_CLOUD_COPY: Command = {
+      id: 'arduino-create-cloud-copy',
+      iconClass: 'fa fa-arduino-cloud-upload',
+    };
+  }
+}

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

@@ -1,101 +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 { Board, BoardsService, ExecutableService } from '../../common/protocol';
-import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import { noBoardSelected } from '../../common/nls';
+import {
+  BoardDetails,
+  BoardIdentifier,
+  BoardsService,
+  CheckDebugEnabledParams,
+  ExecutableService,
+  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 '../../common/protocol/sketches-service-client-impl';
-import { ArduinoMenus } from '../menu/arduino-menus';
-
-import { MainMenuManager } from '../../common/main-menu-manager';
 
 const COMPILE_FOR_DEBUG_KEY = 'arduino-compile-for-debug';
+
+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(MainMenuManager)
-  private readonly mainMenuManager: MainMenuManager;
+  @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 {
@@ -103,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(),
@@ -126,84 +198,77 @@ 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;
-    }
-    const fqbn = board.fqbn;
-    if (!fqbn) {
-      this.disabledMessage = nls.localize(
-        'arduino/debug/noPlatformInstalledFor',
-        "Platform is not installed for '{0}'",
-        board.name
-      );
-      return;
-    }
-    const details = await this.boardService.getBoardDetails({ fqbn });
-    if (!details) {
-      this.disabledMessage = nls.localize(
-        'arduino/debug/noPlatformInstalledFor',
-        "Platform is not installed for '{0}'",
-        board.name
-      );
-      return;
-    }
-    const { debuggingSupported } = details;
-    if (!debuggingSupported) {
-      this.disabledMessage = nls.localize(
-        'arduino/debug/debuggingNotSupported',
-        "Debugging is not supported by '{0}'",
-        board.name
-      );
-    } else {
-      this.disabledMessage = undefined;
+  private async updateMessage(): Promise<void> {
+    try {
+      await this.isDebugEnabled();
+      this.message = undefined;
+    } catch (err) {
+      let message = String(err);
+      if (err instanceof Error) {
+        message = err.message;
+      }
+      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;
+  }
+
+  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 { name, fqbn } = board;
-    if (!fqbn) {
-      return;
+    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;
+    try {
+      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(
+          sketchIsNotCompiled(sketch.name),
+          yes
+        );
+        if (answer === yes) {
+          this.commandService.executeCommand('arduino-verify-sketch');
+        }
+      } else {
+        this.messageService.error(
+          err instanceof Error ? err.message : String(err)
+        );
+      }
     }
-    const ideTempFolderUri = await this.sketchService.getIdeTempFolderUri(
-      sketch
+    return false;
+  }
+
+  private async debug(
+    params: StartDebugParams
+  ): Promise<StartDebugResult | undefined> {
+    return this.commandService.executeCommand<StartDebugResult>(
+      'arduino.debug.start',
+      params
     );
-    const [cliPath, sketchPath, configPath] = await Promise.all([
-      this.fileService.fsPath(new URI(executables.cliUri)),
-      this.fileService.fsPath(new URI(sketch.uri)),
-      this.fileService.fsPath(new URI(ideTempFolderUri)),
-    ]);
-    const config = {
-      cliPath,
-      board: {
-        fqbn,
-        name,
-      },
-      sketchPath,
-      configPath,
-    };
-    return this.commandService.executeCommand('arduino.debug.start', config);
   }
 
   get compileForDebug(): boolean {
@@ -211,11 +276,70 @@ 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));
-    this.mainMenuManager.update();
+    this.menuManager.update();
+  }
+
+  private async isSketchNotVerifiedError(
+    err: unknown,
+    sketch: SketchRef
+  ): Promise<boolean> {
+    if (err instanceof Error) {
+      try {
+        const buildPaths = await this.sketchesService.getBuildPath(sketch);
+        return buildPaths.some((tempBuildPath) =>
+          err.message.includes(tempBuildPath)
+        );
+      } catch {
+        return false;
+      }
+    }
+    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 {
@@ -241,3 +365,78 @@ 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}`
+    );
+  }
+  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
+  );
+}

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

@@ -0,0 +1,168 @@
+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';
+import { WindowService } from '@theia/core/lib/browser/window/window-service';
+import { nls } from '@theia/core/lib/common/nls';
+import type { MaybeArray } from '@theia/core/lib/common/types';
+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 { 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 {
+  /**
+   * Either the URI of the sketch folder or the sketch to delete.
+   */
+  readonly toDelete: string | Sketch;
+  /**
+   * If `true`, the currently opened sketch is expected to be deleted.
+   * Hence, the editors must be closed, the sketch will be scheduled
+   * for deletion, and the browser window will close or navigate away.
+   * If `false`, the sketch will be scheduled for deletion,
+   * but the current window remains open. If `force`, the window will
+   * navigate away, but IDE2 won't open any confirmation dialogs.
+   */
+  readonly willNavigateAway?: boolean | 'force';
+}
+
+@injectable()
+export class DeleteSketch extends CloudSketchContribution {
+  @inject(ApplicationShell)
+  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, {
+      execute: (params: DeleteSketchParams) => this.deleteSketch(params),
+    });
+  }
+
+  private async deleteSketch(params: DeleteSketchParams): Promise<void> {
+    const { toDelete, willNavigateAway } = params;
+    let sketch: Sketch;
+    if (typeof toDelete === 'string') {
+      const resolvedSketch = await this.loadSketch(toDelete);
+      if (!resolvedSketch) {
+        console.info(
+          `Failed to load the sketch. It was not found at '${toDelete}'. Skipping deletion.`
+        );
+        return;
+      }
+      sketch = resolvedSketch;
+    } else {
+      sketch = toDelete;
+    }
+    if (!willNavigateAway) {
+      this.scheduleDeletion(sketch);
+      return;
+    }
+    const cloudUri = this.createFeatures.cloudUri(sketch);
+    if (willNavigateAway !== 'force') {
+      const { response } = await this.dialogService.showMessageBox({
+        title: nls.localizeByDefault('Delete'),
+        type: 'question',
+        buttons: [Dialog.CANCEL, Dialog.OK],
+        message: cloudUri
+          ? nls.localize(
+              'theia/workspace/deleteCloudSketch',
+              "The cloud sketch '{0}' will be permanently deleted from the Arduino servers and the local caches. This action is irreversible. Do you want to delete the current sketch?",
+              sketch.name
+            )
+          : nls.localize(
+              'theia/workspace/deleteCurrentSketch',
+              "The sketch '{0}' will be permanently deleted. This action is irreversible. Do you want to delete the current sketch?",
+              sketch.name
+            ),
+      });
+      // cancel
+      if (response === 0) {
+        return;
+      }
+    }
+    if (cloudUri) {
+      const posixPath = cloudUri.path.toString();
+      const cloudSketch = this.createApi.sketchCache.getSketch(posixPath);
+      if (!cloudSketch) {
+        throw new Error(
+          `Cloud sketch with path '${posixPath}' was not cached. Cache: ${this.createApi.sketchCache.toString()}`
+        );
+      }
+      try {
+        // IDE2 cannot use DELETE directory as the server responses with HTTP 500 if it's missing.
+        // https://github.com/arduino/arduino-ide/issues/1825#issuecomment-1406301406
+        await this.createApi.deleteSketch(cloudSketch.path);
+      } catch (err) {
+        if (!isNotFound(err)) {
+          throw err;
+        } else {
+          console.info(
+            `Could not delete the cloud sketch with path '${posixPath}'. It does not exist.`
+          );
+        }
+      }
+    }
+    await Promise.all([
+      ...Sketch.uris(sketch).map((uri) =>
+        this.closeWithoutSaving(new URI(uri))
+      ),
+    ]);
+    this.windowService.setSafeToShutDown();
+    this.scheduleDeletion(sketch);
+    return window.close();
+  }
+
+  private scheduleDeletion(sketch: Sketch): void {
+    this.appService.scheduleDeletion(sketch);
+  }
+
+  private async loadSketch(uri: string): Promise<Sketch | undefined> {
+    try {
+      const sketch = await this.sketchesService.loadSketch(uri);
+      return sketch;
+    } catch (err) {
+      if (SketchesError.NotFound.is(err)) {
+        return undefined;
+      }
+      throw err;
+    }
+  }
+
+  // fix: https://github.com/eclipse-theia/theia/issues/12107
+  private async closeWithoutSaving(uri: URI): Promise<void> {
+    const affected = getAffected(this.shell.widgets, uri);
+    const toClose = [...affected].map(([, widget]) => widget);
+    await this.shell.closeMany(toClose, { save: false });
+  }
+}
+export namespace DeleteSketch {
+  export namespace Commands {
+    export const DELETE_SKETCH: Command = {
+      id: 'arduino-delete-sketch',
+    };
+  }
+}
+
+function getAffected<T extends Widget>(
+  widgets: Iterable<T>,
+  context: MaybeArray<URI>
+): [URI, T & NavigatableWidget][] {
+  const uris = Array.isArray(context) ? context : [context];
+  const result: [URI, T & NavigatableWidget][] = [];
+  for (const widget of widgets) {
+    if (NavigatableWidget.is(widget)) {
+      const resourceUri = widget.getResourceUri();
+      if (resourceUri && uris.some((uri) => uri.isEqualOrParent(resourceUri))) {
+        result.push([resourceUri, widget]);
+      }
+    }
+  }
+  return result;
+}

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

@@ -1,7 +1,11 @@
+import { nls } from '@theia/core/lib/common';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribution';
 import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
-import { MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-service';
+import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
+import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
+import type { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
+import type { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
 import {
   Contribution,
   Command,
@@ -10,17 +14,11 @@ import {
   CommandRegistry,
 } from './contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import { nls } from '@theia/core/lib/common';
-import type { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
-import type { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
 
 // TODO: [macOS]: to remove `Start Dictation...` and `Emoji & Symbol` see this thread: https://github.com/electron/electron/issues/8283#issuecomment-269522072
 // Depends on https://github.com/eclipse-theia/theia/pull/7964
 @injectable()
 export class EditContributions extends Contribution {
-  @inject(MonacoEditorService)
-  private readonly codeEditorService: MonacoEditorService;
-
   @inject(ClipboardService)
   private readonly clipboardService: ClipboardService;
 
@@ -49,30 +47,6 @@ export class EditContributions extends Contribution {
     registry.registerCommand(EditContributions.Commands.USE_FOR_FIND, {
       execute: () => this.run('editor.action.previousSelectionMatchFindAction'),
     });
-    registry.registerCommand(EditContributions.Commands.INCREASE_FONT_SIZE, {
-      execute: async () => {
-        const settings = await this.settingsService.settings();
-        if (settings.autoScaleInterface) {
-          settings.interfaceScale = settings.interfaceScale + 1;
-        } else {
-          settings.editorFontSize = settings.editorFontSize + 1;
-        }
-        await this.settingsService.update(settings);
-        await this.settingsService.save();
-      },
-    });
-    registry.registerCommand(EditContributions.Commands.DECREASE_FONT_SIZE, {
-      execute: async () => {
-        const settings = await this.settingsService.settings();
-        if (settings.autoScaleInterface) {
-          settings.interfaceScale = settings.interfaceScale - 1;
-        } else {
-          settings.editorFontSize = settings.editorFontSize - 1;
-        }
-        await this.settingsService.update(settings);
-        await this.settingsService.save();
-      },
-    });
     /* Tools */ registry.registerCommand(
       EditContributions.Commands.AUTO_FORMAT,
       { execute: () => this.run('editor.action.formatDocument') }
@@ -81,9 +55,11 @@ export class EditContributions extends Contribution {
       execute: async () => {
         const value = await this.currentValue();
         if (value !== undefined) {
-          this.clipboardService.writeText(`\`\`\`cpp
+          this.clipboardService.writeText(`
+\`\`\`cpp
 ${value}
-\`\`\``);
+\`\`\`
+`);
         }
       },
     });
@@ -141,22 +117,10 @@ ${value}
       label: nls.localize('arduino/editor/decreaseIndent', 'Decrease Indent'),
       order: '2',
     });
-
-    registry.registerMenuAction(ArduinoMenus.EDIT__FONT_CONTROL_GROUP, {
-      commandId: EditContributions.Commands.INCREASE_FONT_SIZE.id,
-      label: nls.localize(
-        'arduino/editor/increaseFontSize',
-        'Increase Font Size'
-      ),
-      order: '0',
-    });
-    registry.registerMenuAction(ArduinoMenus.EDIT__FONT_CONTROL_GROUP, {
-      commandId: EditContributions.Commands.DECREASE_FONT_SIZE.id,
-      label: nls.localize(
-        'arduino/editor/decreaseFontSize',
-        'Decrease Font Size'
-      ),
-      order: '1',
+    registry.registerMenuAction(ArduinoMenus.EDIT__CODE_CONTROL_GROUP, {
+      commandId: EditContributions.Commands.AUTO_FORMAT.id,
+      label: nls.localize('arduino/editor/autoFormat', 'Auto Format'),
+      order: '3',
     });
 
     registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
@@ -215,15 +179,6 @@ ${value}
       when: 'editorFocus',
     });
 
-    registry.registerKeybinding({
-      command: EditContributions.Commands.INCREASE_FONT_SIZE.id,
-      keybinding: 'CtrlCmd+=',
-    });
-    registry.registerKeybinding({
-      command: EditContributions.Commands.DECREASE_FONT_SIZE.id,
-      keybinding: 'CtrlCmd+-',
-    });
-
     registry.registerKeybinding({
       command: EditContributions.Commands.FIND.id,
       keybinding: 'CtrlCmd+F',
@@ -248,10 +203,14 @@ ${value}
     });
   }
 
-  protected async current(): Promise<ICodeEditor | StandaloneCodeEditor  | undefined> {
+  protected async current(): Promise<
+    ICodeEditor | StandaloneCodeEditor | undefined
+  > {
+    const codeEditorService = StandaloneServices.get(ICodeEditorService);
     return (
-      this.codeEditorService.getFocusedCodeEditor() ||
-      this.codeEditorService.getActiveCodeEditor() || undefined
+      codeEditorService.getFocusedCodeEditor() ||
+      codeEditorService.getActiveCodeEditor() ||
+      undefined
     );
   }
 
@@ -307,12 +266,6 @@ export namespace EditContributions {
     export const USE_FOR_FIND: Command = {
       id: 'arduino-for-find',
     };
-    export const INCREASE_FONT_SIZE: Command = {
-      id: 'arduino-increase-font-size',
-    };
-    export const DECREASE_FONT_SIZE: Command = {
-      id: 'arduino-decrease-font-size',
-    };
     export const AUTO_FORMAT: Command = {
       id: 'arduino-auto-format', // `Auto Format` should belong to `Tool`.
     };

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

@@ -1,18 +1,17 @@
-import * as PQueue from 'p-queue';
+import PQueue from 'p-queue';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { CommandHandler } from '@theia/core/lib/common/command';
-import {
-  MenuPath,
-  CompositeMenuNode,
-  SubMenuOptions,
-} from '@theia/core/lib/common/menu';
+import { CommandHandler, CommandService } from '@theia/core/lib/common/command';
+import { MenuPath, SubMenuOptions } from '@theia/core/lib/common/menu';
 import {
   Disposable,
   DisposableCollection,
 } from '@theia/core/lib/common/disposable';
 import { OpenSketch } from './open-sketch';
-import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
-import { MainMenuManager } from '../../common/main-menu-manager';
+import {
+  ArduinoMenus,
+  examplesLabel,
+  PlaceholderMenuNode,
+} from '../menu/arduino-menus';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
 import { ExamplesService } from '../../common/protocol/examples-service';
 import {
@@ -21,58 +20,134 @@ import {
   MenuModelRegistry,
 } from './contribution';
 import { NotificationCenter } from '../notification-center';
-import { Board, SketchRef, SketchContainer } from '../../common/protocol';
-import { nls } from '@theia/core/lib/common';
+import {
+  Board,
+  SketchRef,
+  SketchContainer,
+  SketchesError,
+  CoreService,
+  SketchesService,
+  Sketch,
+  isBoardIdentifierChangeEvent,
+  BoardIdentifier,
+} from '../../common/protocol';
+import { nls } from '@theia/core/lib/common/nls';
+import { unregisterSubmenu } from '../menu/arduino-menus';
+import { MaybePromise } from '@theia/core/lib/common/types';
+import { ApplicationError } from '@theia/core/lib/common/application-error';
+
+/**
+ * Creates a cloned copy of the example sketch and opens it in a new window.
+ */
+export async function openClonedExample(
+  uri: string,
+  services: {
+    sketchesService: SketchesService;
+    commandService: CommandService;
+  },
+  onError: {
+    onDidFailClone?: (
+      err: ApplicationError<
+        number,
+        {
+          uri: string;
+        }
+      >,
+      uri: string
+    ) => MaybePromise<unknown>;
+    onDidFailOpen?: (
+      err: ApplicationError<
+        number,
+        {
+          uri: string;
+        }
+      >,
+      sketch: Sketch
+    ) => MaybePromise<unknown>;
+  } = {}
+): Promise<void> {
+  const { sketchesService, commandService } = services;
+  const { onDidFailClone, onDidFailOpen } = onError;
+  try {
+    const sketch = await sketchesService.cloneExample(uri);
+    try {
+      await commandService.executeCommand(
+        OpenSketch.Commands.OPEN_SKETCH.id,
+        sketch
+      );
+    } catch (openError) {
+      if (SketchesError.NotFound.is(openError)) {
+        if (onDidFailOpen) {
+          await onDidFailOpen(openError, sketch);
+          return;
+        }
+      }
+      throw openError;
+    }
+  } catch (cloneError) {
+    if (SketchesError.NotFound.is(cloneError)) {
+      if (onDidFailClone) {
+        await onDidFailClone(cloneError, uri);
+        return;
+      }
+    }
+    throw cloneError;
+  }
+}
 
 @injectable()
 export abstract class Examples extends SketchContribution {
   @inject(CommandRegistry)
-  protected readonly commandRegistry: CommandRegistry;
+  private readonly commandRegistry: CommandRegistry;
 
   @inject(MenuModelRegistry)
   protected readonly menuRegistry: MenuModelRegistry;
 
-  @inject(MainMenuManager)
-  protected readonly menuManager: MainMenuManager;
-
   @inject(ExamplesService)
   protected readonly examplesService: ExamplesService;
 
+  @inject(CoreService)
+  protected readonly coreService: CoreService;
+
   @inject(BoardsServiceProvider)
-  protected readonly boardsServiceClient: BoardsServiceProvider;
+  protected readonly boardsServiceProvider: BoardsServiceProvider;
+
+  @inject(NotificationCenter)
+  protected readonly notificationCenter: NotificationCenter;
 
   protected readonly toDispose = new DisposableCollection();
 
   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.boardsServiceProvider.boardsConfig.selectedBoard,
+        // No force refresh. The core client was already refreshed.
+      })
     );
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars, unused-imports/no-unused-vars
   protected handleBoardChanged(board: Board | undefined): void {
     // NOOP
   }
 
+  protected abstract update(options?: {
+    board?: 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(
       ArduinoMenus.FILE__EXAMPLES_SUBMENU,
-      nls.localize('arduino/examples/menu', 'Examples'),
+      examplesLabel,
       {
         order: '4',
       }
@@ -108,6 +183,11 @@ export abstract class Examples extends SketchContribution {
         const { label } = sketchContainerOrPlaceholder;
         submenuPath = [...menuPath, label];
         this.menuRegistry.registerSubmenu(submenuPath, label, subMenuOptions);
+        this.toDispose.push(
+          Disposable.create(() =>
+            unregisterSubmenu(submenuPath, this.menuRegistry)
+          )
+        );
         sketches.push(...sketchContainerOrPlaceholder.sketches);
         children.push(...sketchContainerOrPlaceholder.children);
       } else {
@@ -147,12 +227,29 @@ export abstract class Examples extends SketchContribution {
   }
 
   protected createHandler(uri: string): CommandHandler {
+    const forceUpdate = () =>
+      this.update({
+        board: this.boardsServiceProvider.boardsConfig.selectedBoard,
+        forceRefresh: true,
+      });
     return {
       execute: async () => {
-        const sketch = await this.sketchService.cloneExample(uri);
-        return this.commandService.executeCommand(
-          OpenSketch.Commands.OPEN_SKETCH.id,
-          sketch
+        await openClonedExample(
+          uri,
+          {
+            sketchesService: this.sketchesService,
+            commandService: this.commandRegistry,
+          },
+          {
+            onDidFailClone: () => {
+              // Do not toast the error message. It's handled by the `Open Sketch` command.
+              forceUpdate();
+            },
+            onDidFailOpen: (err) => {
+              this.messageService.error(err.message);
+              forceUpdate();
+            },
+          }
         );
       },
     };
@@ -162,10 +259,10 @@ export abstract class Examples extends SketchContribution {
 @injectable()
 export class BuiltInExamples extends Examples {
   override async onReady(): Promise<void> {
-    this.register(); // no `await`
+    this.update(); // no `await`
   }
 
-  protected async register(): Promise<void> {
+  protected override async update(): Promise<void> {
     let sketchContainers: SketchContainer[] | undefined;
     try {
       sketchContainers = await this.examplesService.builtIns();
@@ -196,30 +293,32 @@ export class BuiltInExamples extends Examples {
 
 @injectable()
 export class LibraryExamples extends Examples {
-  @inject(NotificationCenter)
-  protected readonly notificationCenter: NotificationCenter;
-
-  protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
+  private readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
 
   override onStart(): void {
-    this.notificationCenter.onLibraryDidInstall(() => this.register());
-    this.notificationCenter.onLibraryDidUninstall(() => this.register());
+    this.notificationCenter.onLibraryDidInstall(() => this.update());
+    this.notificationCenter.onLibraryDidUninstall(() => this.update());
   }
 
-  override async onReady(): Promise<void> {
-    this.register(); // no `await`
+  override onReady(): void {
+    this.boardsServiceProvider.ready.then(() => this.update());
   }
 
   protected override handleBoardChanged(board: Board | undefined): void {
-    this.register(board);
+    this.update({ board });
   }
 
-  protected async register(
-    board: Board | undefined = this.boardsServiceClient.boardsConfig
-      .selectedBoard
+  protected override async update(
+    options: { board?: Board; forceRefresh?: boolean } = {
+      board: this.boardsServiceProvider.boardsConfig.selectedBoard,
+    }
   ): Promise<void> {
+    const { board, forceRefresh } = options;
     return this.queue.add(async () => {
       this.toDispose.dispose();
+      if (forceRefresh) {
+        await this.coreService.refresh();
+      }
       const fqbn = board?.fqbn;
       const name = board?.name;
       // Shows all examples when no board is selected, or the platform of the currently selected board is not installed.

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

@@ -1,8 +1,14 @@
 import { LocalStorageService } from '@theia/core/lib/browser';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { BoardsService, LibraryService } from '../../common/protocol';
+import {
+  BoardsService,
+  LibraryLocation,
+  LibraryService,
+} from '../../common/protocol';
 import { Contribution } from './contribution';
 
+const Arduino_BuiltIn = 'Arduino_BuiltIn';
+
 @injectable()
 export class FirstStartupInstaller extends Contribution {
   @inject(LocalStorageService)
@@ -21,8 +27,8 @@ export class FirstStartupInstaller extends Contribution {
         id: 'arduino:avr',
       });
       const builtInLibrary = (
-        await this.libraryService.search({ query: 'Arduino_BuiltIn' })
-      )[0];
+        await this.libraryService.search({ query: Arduino_BuiltIn })
+      ).find(({ name }) => name === Arduino_BuiltIn); // Filter by `name` to ensure "exact match". See: https://github.com/arduino/arduino-ide/issues/1526.
 
       let avrPackageError: Error | undefined;
       let builtInLibraryError: Error | undefined;
@@ -43,7 +49,7 @@ export class FirstStartupInstaller extends Contribution {
             // If arduino:avr installation fails because it's already installed we don't want to retry on next start-up
             console.error(e);
           } else {
-            // But if there is any other error (e.g.: no interntet cconnection), we want to retry next time
+            // But if there is any other error (e.g.: no Internet connection), we want to retry next time
             avrPackageError = e;
           }
         }
@@ -57,6 +63,7 @@ export class FirstStartupInstaller extends Contribution {
             item: builtInLibrary,
             installDependencies: true,
             noOverwrite: true, // We don't want to automatically replace custom libraries the user might already have in place
+            installLocation: LibraryLocation.BUILTIN,
           });
         } catch (e) {
           // There's no error code, I need to parse the error message: https://github.com/arduino/arduino-cli/commit/2ea3608453b17b1157f8a1dc892af2e13e40f4f0#diff-1de7569144d4e260f8dde0e0d00a4e2a218c57966d583da1687a70d518986649R95
@@ -64,7 +71,7 @@ export class FirstStartupInstaller extends Contribution {
             // If Arduino_BuiltIn installation fails because it's already installed we don't want to retry on next start-up
             console.log('error installing core', e);
           } else {
-            // But if there is any other error (e.g.: no interntet cconnection), we want to retry next time
+            // But if there is any other error (e.g.: no Internet connection), we want to retry next time
             builtInLibraryError = e;
           }
         }
@@ -79,7 +86,7 @@ export class FirstStartupInstaller extends Contribution {
       }
       if (builtInLibraryError) {
         this.messageService.error(
-          `Could not install ${builtInLibrary.name} library: ${builtInLibraryError}`
+          `Could not install ${Arduino_BuiltIn} library: ${builtInLibraryError}`
         );
       }
 

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

@@ -2,8 +2,7 @@ import { MaybePromise } from '@theia/core';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import * as monaco from '@theia/monaco-editor-core';
 import { Formatter } from '../../common/protocol/formatter';
-import { InoSelector } from '../ino-selectors';
-import { fullRange } from '../utils/monaco';
+import { InoSelector } from '../selectors';
 import { Contribution, URI } from './contribution';
 
 @injectable()
@@ -40,7 +39,7 @@ export class Format
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     _token: monaco.CancellationToken
   ): Promise<monaco.languages.TextEdit[]> {
-    const range = fullRange(model);
+    const range = model.getFullModelRange();
     const text = await this.format(model, range, options);
     return [{ range, text }];
   }

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

@@ -41,7 +41,9 @@ export class Help extends Contribution {
     );
     registry.registerCommand(
       Help.Commands.ENVIRONMENT,
-      createOpenHandler('https://www.arduino.cc/en/Guide/Environment')
+      createOpenHandler(
+        'https://docs.arduino.cc/software/ide-v2/tutorials/getting-started-ide-v2'
+      )
     );
     registry.registerCommand(
       Help.Commands.TROUBLESHOOTING,

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,
@@ -17,46 +16,44 @@ import { SketchContribution, Command, CommandRegistry } from './contribution';
 import { NotificationCenter } from '../notification-center';
 import { nls } from '@theia/core/lib/common';
 import * as monaco from '@theia/monaco-editor-core';
-import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
+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());
     this.notificationCenter.onLibraryDidUninstall(() =>
       this.updateMenuActions()
     );
+    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 {
@@ -92,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 })));
@@ -138,7 +135,7 @@ export class IncludeLibrary extends SketchContribution {
     });
   }
 
-  protected registerLibrary(
+  private registerLibrary(
     libraryOrPlaceholder: LibraryPackage | string,
     menuPath: MenuPath
   ): Disposable {
@@ -171,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/indexes-update-progress.ts

@@ -16,7 +16,7 @@ export class IndexesUpdateProgress extends Contribution {
     | undefined;
 
   override onStart(): void {
-    this.notificationCenter.onIndexWillUpdate((progressId) =>
+    this.notificationCenter.onIndexUpdateWillStart(({ progressId }) =>
       this.getOrCreateProgress(progressId)
     );
     this.notificationCenter.onIndexUpdateDidProgress((progress) => {
@@ -24,7 +24,7 @@ export class IndexesUpdateProgress extends Contribution {
         delegate.report(progress)
       );
     });
-    this.notificationCenter.onIndexDidUpdate((progressId) => {
+    this.notificationCenter.onIndexUpdateDidComplete(({ progressId }) => {
       this.cancelProgress(progressId);
     });
     this.notificationCenter.onIndexUpdateDidFail(({ progressId, message }) => {

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

@@ -1,39 +1,124 @@
-import { Mutex } from 'async-mutex';
+import {
+  Disposable,
+  DisposableCollection,
+} from '@theia/core/lib/common/disposable';
 import { inject, injectable } from '@theia/core/shared/inversify';
+import { Mutex } from 'async-mutex';
 import {
   ArduinoDaemon,
+  BoardIdentifier,
   BoardsService,
+  CompileSummary,
   ExecutableService,
+  isBoardIdentifierChangeEvent,
+  sanitizeFqbn,
 } from '../../common/protocol';
-import { HostedPluginEvents } from '../hosted-plugin-events';
-import { SketchContribution, URI } from './contribution';
-import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
-import { BoardsConfig } from '../boards/boards-config';
+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';
+import { CompileSummaryProvider } from './verify-sketch';
+
+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;
+  @inject(CompileSummaryProvider)
+  private readonly compileSummaryProvider: CompileSummaryProvider;
 
+  private readonly toDispose = new DisposableCollection();
+  private readonly languageServerStartMutex = new Mutex();
   private languageServerFqbn?: string;
-  private languageServerStartMutex = new Mutex();
 
   override onReady(): void {
     const start = (
-      { selectedBoard }: BoardsConfig.Config,
+      selectedBoard: BoardIdentifier | undefined,
       forceStart = false
     ) => {
       if (selectedBoard) {
@@ -43,25 +128,73 @@ export class InoLanguage extends SketchContribution {
         }
       }
     };
-    this.boardsServiceProvider.onBoardsConfigChanged(start);
-    this.hostedPluginEvents.onPluginsDidStart(() =>
-      start(this.boardsServiceProvider.boardsConfig)
-    );
-    this.hostedPluginEvents.onPluginsWillUnload(
-      () => (this.languageServerFqbn = undefined)
-    );
-    this.preferences.onPreferenceChanged(
-      ({ preferenceName, oldValue, newValue }) => {
-        if (oldValue !== newValue) {
-          switch (preferenceName) {
-            case 'arduino.language.log':
-            case 'arduino.language.realTimeDiagnostics':
-              start(this.boardsServiceProvider.boardsConfig, true);
+    const forceRestart = () => {
+      start(this.boardsServiceProvider.boardsConfig.selectedBoard, true);
+    };
+    this.toDispose.pushAll([
+      this.boardsServiceProvider.onBoardsConfigDidChange((event) => {
+        if (isBoardIdentifierChangeEvent(event)) {
+          start(event.selectedBoard);
+        }
+      }),
+      this.hostedPluginEvents.onPluginsDidStart(() =>
+        start(this.boardsServiceProvider.boardsConfig.selectedBoard)
+      ),
+      this.hostedPluginEvents.onPluginsWillUnload(
+        () => (this.languageServerFqbn = undefined)
+      ),
+      this.preferences.onPreferenceChanged(
+        ({ preferenceName, oldValue, newValue }) => {
+          if (oldValue !== newValue) {
+            switch (preferenceName) {
+              case 'arduino.language.log':
+              case 'arduino.language.realTimeDiagnostics':
+              case 'arduino.language.asyncWorkers':
+                forceRestart();
+            }
           }
         }
-      }
-    );
-    start(this.boardsServiceProvider.boardsConfig);
+      ),
+      this.notificationCenter.onLibraryDidInstall(() => forceRestart()),
+      this.notificationCenter.onLibraryDidUninstall(() => forceRestart()),
+      this.notificationCenter.onPlatformDidInstall(() => forceRestart()),
+      this.notificationCenter.onPlatformDidUninstall(() => forceRestart()),
+      this.notificationCenter.onDidReinitialize(() => forceRestart()),
+      this.boardDataStore.onDidChange((event) => {
+        if (this.languageServerFqbn) {
+          const sanitizedFQBN = sanitizeFqbn(this.languageServerFqbn);
+          // The incoming FQBNs might contain custom boards configs, sanitize them before the comparison.
+          // https://github.com/arduino/arduino-ide/pull/2113#pullrequestreview-1499998328
+          const matchingChange = event.changes.find(
+            (change) => sanitizedFQBN === sanitizeFqbn(change.fqbn)
+          );
+          const { boardsConfig } = this.boardsServiceProvider;
+          if (
+            matchingChange &&
+            boardsConfig.selectedBoard?.fqbn === matchingChange.fqbn
+          ) {
+            start(boardsConfig.selectedBoard);
+          }
+        }
+      }),
+      this.compileSummaryProvider.onDidChangeCompileSummary(
+        (compileSummary) => {
+          if (compileSummary) {
+            this.fireBuildDidComplete(compileSummary);
+          }
+        }
+      ),
+    ]);
+    Promise.all([
+      this.boardsServiceProvider.ready,
+      this.preferences.ready,
+    ]).then(() => {
+      start(this.boardsServiceProvider.boardsConfig.selectedBoard);
+    });
+  }
+
+  onStop(): void {
+    this.toDispose.dispose();
   }
 
   private async startLanguageServer(
@@ -70,10 +203,11 @@ export class InoLanguage extends SketchContribution {
     forceStart = false
   ): Promise<void> {
     const port = await this.daemon.tryGetPort();
-    if (!port) {
+    if (typeof port !== 'number') {
       return;
     }
     const release = await this.languageServerStartMutex.acquire();
+    const toDisposeOnRelease = new DisposableCollection();
     try {
       await this.hostedPluginEvents.didStart;
       const details = await this.boardsService.getBoardDetails({ fqbn });
@@ -101,15 +235,26 @@ export class InoLanguage extends SketchContribution {
         }
         return;
       }
-      if (!forceStart && fqbn === this.languageServerFqbn) {
+      const fqbnWithConfig = await this.boardDataStore.appendConfigToFqbn(fqbn);
+      if (!fqbnWithConfig) {
+        throw new Error(
+          `Failed to append boards config to the FQBN. Original FQBN was: ${fqbn}`
+        );
+      }
+      if (!forceStart && fqbnWithConfig === this.languageServerFqbn) {
         // NOOP
         return;
       }
-      this.logger.info(`Starting language server: ${fqbn}`);
       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();
@@ -126,34 +271,89 @@ 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',
-          {
-            lsPath,
-            cliDaemonAddr: `localhost:${port}`,
-            clangdPath,
-            log: currentSketchPath ? currentSketchPath : log,
-            cliDaemonInstance: '1',
-            board: {
-              fqbn,
-              name: name ? `"${name}"` : undefined,
-            },
-            realTimeDiagnostics,
-            silentOutput: true,
-          }
-        ),
+          );
+          toDisposeOnRelease.push(Disposable.create(() => clearTimeout(timer)));
+        }),
+        this.start({
+          lsPath,
+          daemonAddress: {
+            hostname: 'localhost',
+            port,
+            instance: 1, // TODO: get it from the backend
+          },
+          clangdPath,
+          log: currentSketchPath ? currentSketchPath : log,
+          board: {
+            fqbn: fqbnWithConfig,
+            name,
+          },
+          realTimeDiagnostics,
+          silentOutput: true,
+          jobs,
+        }),
       ]);
     } catch (e) {
-      console.log(`Failed to start language server for ${fqbn}`, 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
+    );
+  }
+
+  // Execute the a command contributed by the Arduino Tools VSIX to send the `ino/buildDidComplete` notification to the language server
+  private async fireBuildDidComplete(
+    compileSummary: CompileSummary
+  ): Promise<void> {
+    const params = {
+      ...compileSummary,
+    };
+    console.info(
+      `Executing 'arduino.languageserver.notifyBuildDidComplete' with ${JSON.stringify(
+        params.buildOutputUri
+      )}`
+    );
+
+    try {
+      await this.commandService.executeCommand(
+        'arduino.languageserver.notifyBuildDidComplete',
+        params
+      );
+    } catch (err) {
+      console.error(
+        `Unexpected error when firing event on build did complete. ${JSON.stringify(
+          params.buildOutputUri
+        )}`,
+        err
+      );
+    }
+  }
 }

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

@@ -0,0 +1,173 @@
+import { injectable } from '@theia/core/shared/inversify';
+import {
+  Contribution,
+  Command,
+  MenuModelRegistry,
+  KeybindingRegistry,
+} from './contribution';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import { CommandRegistry, MaybePromise, nls } from '@theia/core/lib/common';
+import { Settings } from '../dialogs/settings/settings';
+import debounce from 'lodash.debounce';
+
+@injectable()
+export class InterfaceScale extends Contribution {
+  private fontScalingEnabled: InterfaceScale.FontScalingEnabled = {
+    increase: true,
+    decrease: true,
+  };
+
+  private currentSettings: Settings;
+  private updateSettingsDebounced = debounce(
+    async () => {
+      await this.settingsService.update(this.currentSettings);
+      await this.settingsService.save();
+    },
+    100,
+    { maxWait: 200 }
+  );
+
+  override onStart(): MaybePromise<void> {
+    const updateCurrent = (settings: Settings) => {
+      this.currentSettings = settings;
+      this.updateFontScalingEnabled();
+    };
+    this.settingsService.onDidChange((settings) => updateCurrent(settings));
+    this.settingsService.settings().then((settings) => updateCurrent(settings));
+  }
+
+  override registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(InterfaceScale.Commands.INCREASE_FONT_SIZE, {
+      execute: () => this.updateFontSize('increase'),
+      isEnabled: () => this.fontScalingEnabled.increase,
+    });
+    registry.registerCommand(InterfaceScale.Commands.DECREASE_FONT_SIZE, {
+      execute: () => this.updateFontSize('decrease'),
+      isEnabled: () => this.fontScalingEnabled.decrease,
+    });
+  }
+
+  override registerMenus(registry: MenuModelRegistry): void {
+    registry.registerMenuAction(ArduinoMenus.EDIT__FONT_CONTROL_GROUP, {
+      commandId: InterfaceScale.Commands.INCREASE_FONT_SIZE.id,
+      label: nls.localize(
+        'arduino/editor/increaseFontSize',
+        'Increase Font Size'
+      ),
+      order: '0',
+    });
+    registry.registerMenuAction(ArduinoMenus.EDIT__FONT_CONTROL_GROUP, {
+      commandId: InterfaceScale.Commands.DECREASE_FONT_SIZE.id,
+      label: nls.localize(
+        'arduino/editor/decreaseFontSize',
+        'Decrease Font Size'
+      ),
+      order: '1',
+    });
+  }
+
+  private updateFontScalingEnabled(): void {
+    let fontScalingEnabled = {
+      increase: true,
+      decrease: true,
+    };
+
+    if (this.currentSettings.autoScaleInterface) {
+      fontScalingEnabled = {
+        increase:
+          this.currentSettings.interfaceScale + InterfaceScale.ZoomLevel.STEP <=
+          InterfaceScale.ZoomLevel.MAX,
+        decrease:
+          this.currentSettings.interfaceScale - InterfaceScale.ZoomLevel.STEP >=
+          InterfaceScale.ZoomLevel.MIN,
+      };
+    } else {
+      fontScalingEnabled = {
+        increase:
+          this.currentSettings.editorFontSize + InterfaceScale.FontSize.STEP <=
+          InterfaceScale.FontSize.MAX,
+        decrease:
+          this.currentSettings.editorFontSize - InterfaceScale.FontSize.STEP >=
+          InterfaceScale.FontSize.MIN,
+      };
+    }
+
+    const isChanged = Object.keys(fontScalingEnabled).some(
+      (key: keyof InterfaceScale.FontScalingEnabled) =>
+        fontScalingEnabled[key] !== this.fontScalingEnabled[key]
+    );
+    if (isChanged) {
+      this.fontScalingEnabled = fontScalingEnabled;
+      this.menuManager.update();
+    }
+  }
+
+  private updateFontSize(mode: 'increase' | 'decrease'): void {
+    if (this.currentSettings.autoScaleInterface) {
+      mode === 'increase'
+        ? (this.currentSettings.interfaceScale += InterfaceScale.ZoomLevel.STEP)
+        : (this.currentSettings.interfaceScale -=
+            InterfaceScale.ZoomLevel.STEP);
+    } else {
+      mode === 'increase'
+        ? (this.currentSettings.editorFontSize += InterfaceScale.FontSize.STEP)
+        : (this.currentSettings.editorFontSize -= InterfaceScale.FontSize.STEP);
+    }
+    this.updateFontScalingEnabled();
+    this.updateSettingsDebounced();
+  }
+
+  override registerKeybindings(registry: KeybindingRegistry): void {
+    registry.registerKeybinding({
+      command: InterfaceScale.Commands.INCREASE_FONT_SIZE.id,
+      keybinding: 'CtrlCmd+=',
+    });
+    registry.registerKeybinding({
+      command: InterfaceScale.Commands.DECREASE_FONT_SIZE.id,
+      keybinding: 'CtrlCmd+-',
+    });
+  }
+}
+
+export namespace InterfaceScale {
+  export namespace Commands {
+    export const INCREASE_FONT_SIZE: Command = {
+      id: 'arduino-increase-font-size',
+    };
+    export const DECREASE_FONT_SIZE: Command = {
+      id: 'arduino-decrease-font-size',
+    };
+  }
+
+  export namespace ZoomLevel {
+    export const MIN = -8;
+    export const MAX = 9;
+    export const STEP = 1;
+
+    export function toPercentage(scale: number): number {
+      return scale * 20 + 100;
+    }
+    export function fromPercentage(percentage: number): number {
+      return (percentage - 100) / 20;
+    }
+    export namespace Step {
+      export function toPercentage(step: number): number {
+        return step * 20;
+      }
+      export function fromPercentage(percentage: number): number {
+        return percentage / 20;
+      }
+    }
+  }
+
+  export namespace FontSize {
+    export const MIN = 8;
+    export const MAX = 72;
+    export const STEP = 2;
+  }
+
+  export interface FontScalingEnabled {
+    increase: boolean;
+    decrease: boolean;
+  }
+}

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

@@ -0,0 +1,204 @@
+import { KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
+import { CompositeTreeNode } from '@theia/core/lib/browser/tree';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { MenuModelRegistry } from '@theia/core/lib/common/menu';
+import { Progress } from '@theia/core/lib/common/message-service-protocol';
+import { nls } from '@theia/core/lib/common/nls';
+import { injectable } from '@theia/core/shared/inversify';
+import { CreateUri } from '../create/create-uri';
+import { Create, isConflict } from '../create/typings';
+import { ArduinoMenus } from '../menu/arduino-menus';
+import {
+  TaskFactoryImpl,
+  WorkspaceInputDialogWithProgress,
+} from '../theia/workspace/workspace-input-dialog';
+import { CloudSketchbookTree } from '../widgets/cloud-sketchbook/cloud-sketchbook-tree';
+import { CloudSketchbookTreeModel } from '../widgets/cloud-sketchbook/cloud-sketchbook-tree-model';
+import { SketchbookCommands } from '../widgets/sketchbook/sketchbook-commands';
+import {
+  CloudSketchContribution,
+  pullingSketch,
+  sketchAlreadyExists,
+  synchronizingSketchbook,
+} from './cloud-contribution';
+import { Command, CommandRegistry, Sketch } from './contribution';
+
+export interface CreateNewCloudSketchCallback {
+  (
+    newSketch: Create.Sketch,
+    newNode: CloudSketchbookTree.CloudSketchDirNode,
+    progress: Progress
+  ): Promise<void>;
+}
+
+export interface NewCloudSketchParams {
+  /**
+   * Value to populate the dialog `<input>` when it opens.
+   */
+  readonly initialValue?: string | undefined;
+  /**
+   * Additional callback to call when the new cloud sketch has been created.
+   */
+  readonly callback?: CreateNewCloudSketchCallback;
+  /**
+   * If `true`, the validation error message will not be visible in the input dialog, but the `OK` button will be disabled. Defaults to `true`.
+   */
+  readonly skipShowErrorMessageOnOpen?: boolean;
+}
+
+@injectable()
+export class NewCloudSketch extends CloudSketchContribution {
+  private readonly toDispose = new DisposableCollection();
+
+  override onReady(): void {
+    this.toDispose.pushAll([
+      this.createFeatures.onDidChangeEnabled(() => this.menuManager.update()),
+      this.createFeatures.onDidChangeSession(() => this.menuManager.update()),
+    ]);
+    if (this.createFeatures.session) {
+      this.menuManager.update();
+    }
+  }
+
+  onStop(): void {
+    this.toDispose.dispose();
+  }
+
+  override registerCommands(registry: CommandRegistry): void {
+    registry.registerCommand(NewCloudSketch.Commands.NEW_CLOUD_SKETCH, {
+      execute: (params: NewCloudSketchParams) =>
+        this.createNewSketch(
+          params?.skipShowErrorMessageOnOpen === false ? false : true,
+          params?.initialValue,
+          params?.callback
+        ),
+      isEnabled: () => Boolean(this.createFeatures.session),
+      isVisible: () => this.createFeatures.enabled,
+    });
+  }
+
+  override registerMenus(registry: MenuModelRegistry): void {
+    registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
+      commandId: NewCloudSketch.Commands.NEW_CLOUD_SKETCH.id,
+      label: nls.localize('arduino/cloudSketch/new', 'New Cloud Sketch'),
+      order: '1',
+    });
+  }
+
+  override registerKeybindings(registry: KeybindingRegistry): void {
+    registry.registerKeybinding({
+      command: NewCloudSketch.Commands.NEW_CLOUD_SKETCH.id,
+      keybinding: 'CtrlCmd+Alt+N',
+    });
+  }
+
+  private async createNewSketch(
+    skipShowErrorMessageOnOpen: boolean,
+    initialValue?: string | undefined,
+    callback?: CreateNewCloudSketchCallback
+  ): Promise<void> {
+    const treeModel = await this.treeModel();
+    if (treeModel) {
+      const rootNode = treeModel.root;
+      return this.openWizard(
+        rootNode,
+        treeModel,
+        skipShowErrorMessageOnOpen,
+        initialValue,
+        callback
+      );
+    }
+  }
+
+  private async openWizard(
+    rootNode: CompositeTreeNode,
+    treeModel: CloudSketchbookTreeModel,
+    skipShowErrorMessageOnOpen: boolean,
+    initialValue?: string | undefined,
+    callback?: CreateNewCloudSketchCallback
+  ): Promise<void> {
+    const existingNames = rootNode.children
+      .filter(CloudSketchbookTree.CloudSketchDirNode.is)
+      .map(({ fileStat }) => fileStat.name);
+    const taskFactory = new TaskFactoryImpl((value) =>
+      this.createNewSketchWithProgress(treeModel, value, callback)
+    );
+    try {
+      const dialog = new WorkspaceInputDialogWithProgress(
+        {
+          title: nls.localize(
+            'arduino/newCloudSketch/newSketchTitle',
+            'Name of the new Cloud Sketch'
+          ),
+          parentUri: CreateUri.root,
+          initialValue,
+          validate: (input) => {
+            if (existingNames.includes(input)) {
+              return sketchAlreadyExists(input);
+            }
+            return Sketch.validateCloudSketchFolderName(input) ?? '';
+          },
+        },
+        this.labelProvider,
+        taskFactory
+      );
+      await dialog.open(skipShowErrorMessageOnOpen);
+      if (dialog.taskResult) {
+        this.openInNewWindow(dialog.taskResult);
+      }
+    } catch (err) {
+      if (isConflict(err)) {
+        await treeModel.refresh();
+        return this.createNewSketch(
+          false,
+          taskFactory.value ?? initialValue,
+          callback
+        );
+      }
+      throw err;
+    }
+  }
+
+  private createNewSketchWithProgress(
+    treeModel: CloudSketchbookTreeModel,
+    value: string,
+    callback?: CreateNewCloudSketchCallback
+  ): (
+    progress: Progress
+  ) => Promise<CloudSketchbookTree.CloudSketchDirNode | undefined> {
+    return async (progress: Progress) => {
+      progress.report({
+        message: nls.localize(
+          'arduino/cloudSketch/creating',
+          "Creating cloud sketch '{0}'...",
+          value
+        ),
+      });
+      const sketch = await this.createApi.createSketch(value);
+      progress.report({ message: synchronizingSketchbook });
+      await treeModel.refresh();
+      progress.report({ message: pullingSketch(sketch.name) });
+      const node = await this.pull(sketch);
+      if (callback && node) {
+        await callback(sketch, node, progress);
+      }
+      return node;
+    };
+  }
+
+  private openInNewWindow(
+    node: CloudSketchbookTree.CloudSketchDirNode
+  ): Promise<void> {
+    return this.commandService.executeCommand(
+      SketchbookCommands.OPEN_NEW_WINDOW.id,
+      { node, treeWidgetId: 'cloud-sketchbook-composite-widget' }
+    );
+  }
+}
+export namespace NewCloudSketch {
+  export namespace Commands {
+    export const NEW_CLOUD_SKETCH: Command = {
+      id: 'arduino-new-cloud-sketch',
+    };
+  }
+}

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

@@ -1,7 +1,6 @@
 import { nls } from '@theia/core/lib/common';
 import { injectable } from '@theia/core/shared/inversify';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import {
   SketchContribution,
   URI,
@@ -17,17 +16,12 @@ export class NewSketch extends SketchContribution {
     registry.registerCommand(NewSketch.Commands.NEW_SKETCH, {
       execute: () => this.newSketch(),
     });
-    registry.registerCommand(NewSketch.Commands.NEW_SKETCH__TOOLBAR, {
-      isVisible: (widget) =>
-        ArduinoToolbar.is(widget) && widget.side === 'left',
-      execute: () => registry.executeCommand(NewSketch.Commands.NEW_SKETCH.id),
-    });
   }
 
   override registerMenus(registry: MenuModelRegistry): void {
     registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
       commandId: NewSketch.Commands.NEW_SKETCH.id,
-      label: nls.localize('arduino/sketch/new', 'New'),
+      label: nls.localize('arduino/sketch/new', 'New Sketch'),
       order: '0',
     });
   }
@@ -41,7 +35,7 @@ export class NewSketch extends SketchContribution {
 
   async newSketch(): Promise<void> {
     try {
-      const sketch = await this.sketchService.createNewSketch();
+      const sketch = await this.sketchesService.createNewSketch();
       this.workspaceService.open(new URI(sketch.uri));
     } catch (e) {
       await this.messageService.error(e.toString());
@@ -54,8 +48,5 @@ export namespace NewSketch {
     export const NEW_SKETCH: Command = {
       id: 'arduino-new-sketch',
     };
-    export const NEW_SKETCH__TOOLBAR: Command = {
-      id: 'arduino-new-sketch--toolbar',
-    };
   }
 }

arduino-ide-extension/src/browser/contributions/open-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(true, params),
     });
   }
 }

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

@@ -15,6 +15,7 @@ import { MainMenuManager } from '../../common/main-menu-manager';
 import { OpenSketch } from './open-sketch';
 import { NotificationCenter } from '../notification-center';
 import { nls } from '@theia/core/lib/common';
+import { SketchesError } from '../../common/protocol';
 
 @injectable()
 export class OpenRecentSketch extends SketchContribution {
@@ -33,7 +34,7 @@ export class OpenRecentSketch extends SketchContribution {
   @inject(NotificationCenter)
   protected readonly notificationCenter: NotificationCenter;
 
-  protected toDisposeBeforeRegister = new Map<string, DisposableCollection>();
+  protected toDispose = new DisposableCollection();
 
   override onStart(): void {
     this.notificationCenter.onRecentSketchesDidChange(({ sketches }) =>
@@ -42,8 +43,12 @@ export class OpenRecentSketch extends SketchContribution {
   }
 
   override async onReady(): Promise<void> {
-    this.sketchService
-      .recentlyOpenedSketches()
+    this.update();
+  }
+
+  private update(forceUpdate?: boolean): void {
+    this.sketchesService
+      .recentlyOpenedSketches(forceUpdate)
       .then((sketches) => this.refreshMenu(sketches));
   }
 
@@ -62,19 +67,25 @@ export class OpenRecentSketch extends SketchContribution {
 
   protected register(sketches: Sketch[]): void {
     const order = 0;
+    this.toDispose.dispose();
     for (const sketch of sketches) {
       const { uri } = sketch;
-      const toDispose = this.toDisposeBeforeRegister.get(uri);
-      if (toDispose) {
-        toDispose.dispose();
-      }
       const command = { id: `arduino-open-recent--${uri}` };
       const handler = {
-        execute: () =>
-          this.commandRegistry.executeCommand(
-            OpenSketch.Commands.OPEN_SKETCH.id,
-            sketch
-          ),
+        execute: async () => {
+          try {
+            await this.commandRegistry.executeCommand(
+              OpenSketch.Commands.OPEN_SKETCH.id,
+              sketch
+            );
+          } catch (err) {
+            if (SketchesError.NotFound.is(err)) {
+              this.update(true);
+            } else {
+              throw err;
+            }
+          }
+        },
       };
       this.commandRegistry.registerCommand(command, handler);
       this.menuRegistry.registerMenuAction(
@@ -85,8 +96,7 @@ export class OpenRecentSketch extends SketchContribution {
           order: String(order),
         }
       );
-      this.toDisposeBeforeRegister.set(
-        sketch.uri,
+      this.toDispose.pushAll([
         new DisposableCollection(
           Disposable.create(() =>
             this.commandRegistry.unregisterCommand(command)
@@ -94,8 +104,8 @@ export class OpenRecentSketch extends SketchContribution {
           Disposable.create(() =>
             this.menuRegistry.unregisterMenuAction(command)
           )
-        )
-      );
+        ),
+      ]);
     }
   }
 }

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

@@ -1,32 +1,34 @@
+import { nls } from '@theia/core/lib/common/nls';
 import { inject, injectable } from '@theia/core/shared/inversify';
+import type { Settings } from '../dialogs/settings/settings';
+import { SettingsDialog } from '../dialogs/settings/settings-dialog';
+import { ArduinoMenus } from '../menu/arduino-menus';
 import {
   Command,
-  MenuModelRegistry,
   CommandRegistry,
-  SketchContribution,
   KeybindingRegistry,
+  MenuModelRegistry,
+  SketchContribution,
 } from './contribution';
-import { ArduinoMenus } from '../menu/arduino-menus';
-import { Settings as Preferences } from '../dialogs/settings/settings';
-import { SettingsDialog } from '../dialogs/settings/settings-dialog';
-import { nls } from '@theia/core/lib/common';
 
 @injectable()
-export class Settings extends SketchContribution {
+export class OpenSettings extends SketchContribution {
   @inject(SettingsDialog)
-  protected readonly settingsDialog: SettingsDialog;
+  private readonly settingsDialog: SettingsDialog;
 
-  protected settingsOpened = false;
+  private settingsOpened = false;
 
   override registerCommands(registry: CommandRegistry): void {
-    registry.registerCommand(Settings.Commands.OPEN, {
+    registry.registerCommand(OpenSettings.Commands.OPEN, {
       execute: async () => {
-        let settings: Preferences | undefined = undefined;
+        let settings: Settings | undefined = undefined;
         try {
           this.settingsOpened = true;
+          this.menuManager.update();
           settings = await this.settingsDialog.open();
         } finally {
           this.settingsOpened = false;
+          this.menuManager.update();
         }
         if (settings) {
           await this.settingsService.update(settings);
@@ -41,7 +43,7 @@ export class Settings extends SketchContribution {
 
   override registerMenus(registry: MenuModelRegistry): void {
     registry.registerMenuAction(ArduinoMenus.FILE__PREFERENCES_GROUP, {
-      commandId: Settings.Commands.OPEN.id,
+      commandId: OpenSettings.Commands.OPEN.id,
       label:
         nls.localize(
           'vscode/preferences.contribution/preferences',
@@ -57,13 +59,13 @@ export class Settings extends SketchContribution {
 
   override registerKeybindings(registry: KeybindingRegistry): void {
     registry.registerKeybinding({
-      command: Settings.Commands.OPEN.id,
+      command: OpenSettings.Commands.OPEN.id,
       keybinding: 'CtrlCmd+,',
     });
   }
 }
 
-export namespace Settings {
+export namespace OpenSettings {
   export namespace Commands {
     export const OPEN: Command = {
       id: 'arduino-settings-open',

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

@@ -1,7 +1,8 @@
 import { nls } from '@theia/core/lib/common/nls';
 import { injectable } from '@theia/core/shared/inversify';
 import type { EditorOpenerOptions } from '@theia/editor/lib/browser/editor-manager';
-import { SketchesError } from '../../common/protocol';
+import { Later } from '../../common/nls';
+import { Sketch, SketchesError } from '../../common/protocol';
 import {
   Command,
   CommandRegistry,
@@ -9,12 +10,18 @@ import {
   URI,
 } from './contribution';
 import { SaveAsSketch } from './save-as-sketch';
+import { promptMoveSketch } from './open-sketch';
+import { ApplicationError } from '@theia/core/lib/common/application-error';
+import { Deferred, wait } from '@theia/core/lib/common/promise-util';
+import { EditorWidget } from '@theia/editor/lib/browser/editor-widget';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
 
 @injectable()
 export class OpenSketchFiles extends SketchContribution {
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(OpenSketchFiles.Commands.OPEN_SKETCH_FILES, {
-      execute: (uri: URI) => this.openSketchFiles(uri),
+      execute: (uri: URI, focusMainSketchFile) =>
+        this.openSketchFiles(uri, focusMainSketchFile),
     });
     registry.registerCommand(OpenSketchFiles.Commands.ENSURE_OPENED, {
       execute: (
@@ -27,13 +34,23 @@ export class OpenSketchFiles extends SketchContribution {
     });
   }
 
-  private async openSketchFiles(uri: URI): Promise<void> {
+  private async openSketchFiles(
+    uri: URI,
+    focusMainSketchFile = false
+  ): Promise<void> {
     try {
-      const sketch = await this.sketchService.loadSketch(uri.toString());
+      const sketch = await this.sketchesService.loadSketch(uri.toString());
       const { mainFileUri, rootFolderFileUris } = sketch;
       for (const uri of [mainFileUri, ...rootFolderFileUris]) {
         await this.ensureOpened(uri);
       }
+      if (focusMainSketchFile) {
+        await this.ensureOpened(mainFileUri, true, {
+          mode: 'activate',
+          preview: false,
+          counter: 0,
+        });
+      }
       if (mainFileUri.endsWith('.pde')) {
         const message = nls.localize(
           'arduino/common/oldFormat',
@@ -41,24 +58,38 @@ export class OpenSketchFiles extends SketchContribution {
           sketch.name
         );
         const yes = nls.localize('vscode/extensionsUtils/yes', 'Yes');
-        this.messageService
-          .info(message, nls.localize('arduino/common/later', 'Later'), yes)
-          .then(async (answer) => {
-            if (answer === yes) {
-              this.commandService.executeCommand(
-                SaveAsSketch.Commands.SAVE_AS_SKETCH.id,
-                {
-                  execOnlyIfTemp: false,
-                  openAfterMove: true,
-                  wipeOriginal: false,
-                }
-              );
-            }
-          });
+        this.messageService.info(message, Later, yes).then((answer) => {
+          if (answer === yes) {
+            this.commandService.executeCommand(
+              SaveAsSketch.Commands.SAVE_AS_SKETCH.id,
+              {
+                execOnlyIfTemp: false,
+                openAfterMove: true,
+                wipeOriginal: false,
+              }
+            );
+          }
+        });
+      }
+      const { workspaceError } = this.workspaceService;
+      // This happens when the IDE2 has been started (from either a terminal or clicking on an `ino` file) with a /path/to/invalid/sketch. (#964)
+      if (SketchesError.InvalidName.is(workspaceError)) {
+        await this.promptMove(workspaceError);
       }
     } catch (err) {
+      // This happens when the user gracefully closed IDE2, all went well
+      // but the main sketch file was renamed outside of IDE2 and when the user restarts the IDE2
+      // the workspace path still exists, but the sketch path is not valid anymore. (#964)
+      if (SketchesError.InvalidName.is(err)) {
+        const movedSketch = await this.promptMove(err);
+        if (!movedSketch) {
+          // If user did not accept the move, or move was not possible, force reload with a fallback.
+          return this.openFallbackSketch();
+        }
+      }
+
       if (SketchesError.NotFound.is(err)) {
-        this.openFallbackSketch();
+        return this.openFallbackSketch();
       } else {
         console.error(err);
         const message =
@@ -72,8 +103,34 @@ export class OpenSketchFiles extends SketchContribution {
     }
   }
 
+  private async promptMove(
+    err: ApplicationError<
+      number,
+      {
+        invalidMainSketchUri: string;
+      }
+    >
+  ): Promise<Sketch | undefined> {
+    const { invalidMainSketchUri } = err.data;
+    requestAnimationFrame(() => this.messageService.error(err.message));
+    await wait(250); // let IDE2 open the editor and toast the error message, then open the modal dialog
+    const movedSketch = await promptMoveSketch(invalidMainSketchUri, {
+      fileService: this.fileService,
+      sketchesService: this.sketchesService,
+      labelProvider: this.labelProvider,
+      dialogService: this.dialogService,
+    });
+    if (movedSketch) {
+      this.workspaceService.open(new URI(movedSketch.uri), {
+        preserveWindow: true,
+      });
+      return movedSketch;
+    }
+    return undefined;
+  }
+
   private async openFallbackSketch(): Promise<void> {
-    const sketch = await this.sketchService.createNewSketch();
+    const sketch = await this.sketchesService.createNewSketch();
     this.workspaceService.open(new URI(sketch.uri), { preserveWindow: true });
   }
 
@@ -81,20 +138,84 @@ export class OpenSketchFiles extends SketchContribution {
     uri: string,
     forceOpen = false,
     options?: EditorOpenerOptions
-  ): Promise<unknown> {
+  ): Promise<EditorWidget | undefined> {
     const widget = this.editorManager.all.find(
       (widget) => widget.editor.uri.toString() === uri
     );
-    if (!widget || forceOpen) {
-      return this.editorManager.open(
+    if (widget && !forceOpen) {
+      return widget;
+    }
+
+    const disposables = new DisposableCollection();
+    const deferred = new Deferred<EditorWidget>();
+    // An editor can be in two primary states:
+    // - The editor is not yet opened. The `widget` is `undefined`. With `editorManager#open`, Theia will create an editor and fire an `editorManager#onCreated` event.
+    // - The editor is opened. Can be active, current, or open.
+    //   - If the editor has the focus (the cursor blinks in the editor): it's the active editor.
+    //   - If the editor does not have the focus (the focus is on a different widget or the context menu is opened in the editor): it's the current editor.
+    //   - If the editor is not the top editor in the main area, it's opened.
+    if (!widget) {
+      // If the widget is `undefined`, IDE2 expects one `onCreate` event. Subscribe to the `onCreated` event
+      // and resolve the promise with the editor only when the new editor's visibility changes.
+      disposables.push(
+        this.editorManager.onCreated((editor) => {
+          if (editor.editor.uri.toString() === uri) {
+            if (editor.isAttached && editor.isVisible) {
+              deferred.resolve(editor);
+            } else {
+              disposables.push(
+                editor.onDidChangeVisibility((visible) => {
+                  if (visible) {
+                    // wait an animation frame. although the visible and attached props are true the editor is not there.
+                    // let the browser render the widget
+                    setTimeout(
+                      () =>
+                        requestAnimationFrame(() => deferred.resolve(editor)),
+                      0
+                    );
+                  }
+                })
+              );
+            }
+          }
+        })
+      );
+    }
+
+    this.editorManager
+      .open(
         new URI(uri),
         options ?? {
           mode: 'reveal',
           preview: false,
           counter: 0,
         }
+      )
+      .then((editorWidget) => {
+        // If the widget was defined, it was already opened.
+        // The editor is expected to be attached to the shell and visible in the UI.
+        // The deferred promise does not have to wait for the `editorManager#onCreated` event.
+        // It can resolve earlier.
+        if (widget) {
+          deferred.resolve(editorWidget);
+        }
+      });
+
+    const timeout = 5_000; // number of ms IDE2 waits for the editor to show up in the UI
+    const result: EditorWidget | undefined | 'timeout' = await Promise.race([
+      deferred.promise,
+      wait(timeout).then(() => {
+        disposables.dispose();
+        return 'timeout' as const;
+      }),
+    ]);
+    if (result === 'timeout') {
+      console.warn(
+        `Timeout after ${timeout} millis. The editor has not shown up in time. URI: ${uri}`
       );
+      return undefined;
     }
+    return result;
   }
 }
 export namespace OpenSketchFiles {

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

@@ -1,115 +1,50 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
-import * as remote from '@theia/core/electron-shared/@electron/remote';
-import { MaybePromise } from '@theia/core/lib/common/types';
-import { Widget, ContextMenuRenderer } from '@theia/core/lib/browser';
+import { nls } from '@theia/core/lib/common/nls';
+import { injectable } from '@theia/core/shared/inversify';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { LabelProvider } from '@theia/core/lib/browser/label-provider';
 import {
-  Disposable,
-  DisposableCollection,
-} from '@theia/core/lib/common/disposable';
+  SketchesError,
+  SketchesService,
+  SketchRef,
+} from '../../common/protocol';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import {
-  SketchContribution,
-  Sketch,
-  URI,
   Command,
   CommandRegistry,
-  MenuModelRegistry,
   KeybindingRegistry,
+  MenuModelRegistry,
+  Sketch,
+  SketchContribution,
+  URI,
 } from './contribution';
-import { ExamplesService } from '../../common/protocol/examples-service';
-import { BuiltInExamples } from './examples';
-import { Sketchbook } from './sketchbook';
-import { SketchContainer } from '../../common/protocol';
-import { nls } from '@theia/core/lib/common';
+import { DialogService } from '../dialog-service';
+
+export type SketchLocation = string | URI | SketchRef;
+export namespace SketchLocation {
+  export function toUri(location: SketchLocation): URI {
+    if (typeof location === 'string') {
+      return new URI(location);
+    } else if (SketchRef.is(location)) {
+      return toUri(location.uri);
+    } else {
+      return location;
+    }
+  }
+  export function is(arg: unknown): arg is SketchLocation {
+    return typeof arg === 'string' || arg instanceof URI || SketchRef.is(arg);
+  }
+}
 
 @injectable()
 export class OpenSketch extends SketchContribution {
-  @inject(MenuModelRegistry)
-  protected readonly menuRegistry: MenuModelRegistry;
-
-  @inject(ContextMenuRenderer)
-  protected readonly contextMenuRenderer: ContextMenuRenderer;
-
-  @inject(BuiltInExamples)
-  protected readonly builtInExamples: BuiltInExamples;
-
-  @inject(ExamplesService)
-  protected readonly examplesService: ExamplesService;
-
-  @inject(Sketchbook)
-  protected readonly sketchbook: Sketchbook;
-
-  protected readonly toDispose = new DisposableCollection();
-
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(OpenSketch.Commands.OPEN_SKETCH, {
-      execute: (arg) =>
-        Sketch.is(arg) ? this.openSketch(arg) : this.openSketch(),
-    });
-    registry.registerCommand(OpenSketch.Commands.OPEN_SKETCH__TOOLBAR, {
-      isVisible: (widget) =>
-        ArduinoToolbar.is(widget) && widget.side === 'left',
-      execute: async (_: Widget, target: EventTarget) => {
-        const container = await this.sketchService.getSketches({
-          exclude: ['**/hardware/**'],
-        });
-        if (SketchContainer.isEmpty(container)) {
-          this.openSketch();
-        } else {
-          this.toDispose.dispose();
-          if (!(target instanceof HTMLElement)) {
-            return;
-          }
-          const { parentElement } = target;
-          if (!parentElement) {
-            return;
-          }
-
-          this.menuRegistry.registerMenuAction(
-            ArduinoMenus.OPEN_SKETCH__CONTEXT__OPEN_GROUP,
-            {
-              commandId: OpenSketch.Commands.OPEN_SKETCH.id,
-              label: nls.localize(
-                'vscode/workspaceActions/openFileFolder',
-                'Open...'
-              ),
-            }
-          );
-          this.toDispose.push(
-            Disposable.create(() =>
-              this.menuRegistry.unregisterMenuAction(
-                OpenSketch.Commands.OPEN_SKETCH
-              )
-            )
-          );
-          this.sketchbook.registerRecursively(
-            [...container.children, ...container.sketches],
-            ArduinoMenus.OPEN_SKETCH__CONTEXT__RECENT_GROUP,
-            this.toDispose
-          );
-          try {
-            const containers = await this.examplesService.builtIns();
-            for (const container of containers) {
-              this.builtInExamples.registerRecursively(
-                container,
-                ArduinoMenus.OPEN_SKETCH__CONTEXT__EXAMPLES_GROUP,
-                this.toDispose
-              );
-            }
-          } catch (e) {
-            console.error('Error when collecting built-in examples.', e);
-          }
-          const options = {
-            menuPath: ArduinoMenus.OPEN_SKETCH__CONTEXT,
-            anchor: {
-              x: parentElement.getBoundingClientRect().left,
-              y:
-                parentElement.getBoundingClientRect().top +
-                parentElement.offsetHeight,
-            },
-          };
-          this.contextMenuRenderer.render(options);
+      execute: async (arg) => {
+        const toOpen = !SketchLocation.is(arg)
+          ? await this.selectSketch()
+          : arg;
+        if (toOpen) {
+          return this.openSketch(toOpen);
         }
       },
     });
@@ -119,7 +54,7 @@ export class OpenSketch extends SketchContribution {
     registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
       commandId: OpenSketch.Commands.OPEN_SKETCH.id,
       label: nls.localize('vscode/workspaceActions/openFileFolder', 'Open...'),
-      order: '1',
+      order: '2',
     });
   }
 
@@ -130,21 +65,25 @@ export class OpenSketch extends SketchContribution {
     });
   }
 
-  async openSketch(
-    toOpen: MaybePromise<Sketch | undefined> = this.selectSketch()
-  ): Promise<void> {
-    const sketch = await toOpen;
-    if (sketch) {
-      this.workspaceService.open(new URI(sketch.uri));
+  private async openSketch(toOpen: SketchLocation | undefined): Promise<void> {
+    if (!toOpen) {
+      return;
     }
+    const uri = SketchLocation.toUri(toOpen);
+    try {
+      await this.sketchesService.loadSketch(uri.toString());
+    } catch (err) {
+      if (SketchesError.NotFound.is(err)) {
+        this.messageService.error(err.message);
+      }
+      throw err;
+    }
+    this.workspaceService.open(uri);
   }
 
-  protected async selectSketch(): Promise<Sketch | undefined> {
-    const config = await this.configService.getConfiguration();
-    const defaultPath = await this.fileService.fsPath(
-      new URI(config.sketchDirUri)
-    );
-    const { filePaths } = await remote.dialog.showOpenDialog({
+  private async selectSketch(): Promise<Sketch | undefined> {
+    const defaultPath = await this.defaultPath();
+    const { filePaths } = await this.dialogService.showOpenDialog({
       defaultPath,
       properties: ['createDirectory', 'openFile'],
       filters: [
@@ -164,50 +103,17 @@ export class OpenSketch extends SketchContribution {
     }
     const sketchFilePath = filePaths[0];
     const sketchFileUri = await this.fileSystemExt.getUri(sketchFilePath);
-    const sketch = await this.sketchService.getSketchFolder(sketchFileUri);
+    const sketch = await this.sketchesService.getSketchFolder(sketchFileUri);
     if (sketch) {
       return sketch;
     }
     if (Sketch.isSketchFile(sketchFileUri)) {
-      const name = new URI(sketchFileUri).path.name;
-      const nameWithExt = this.labelProvider.getName(new URI(sketchFileUri));
-      const { response } = await remote.dialog.showMessageBox({
-        title: nls.localize('arduino/sketch/moving', 'Moving'),
-        type: 'question',
-        buttons: [
-          nls.localize('vscode/issueMainService/cancel', 'Cancel'),
-          nls.localize('vscode/issueMainService/ok', 'OK'),
-        ],
-        message: nls.localize(
-          'arduino/sketch/movingMsg',
-          'The file "{0}" needs to be inside a sketch folder named "{1}".\nCreate this folder, move the file, and continue?',
-          nameWithExt,
-          name
-        ),
+      return promptMoveSketch(sketchFileUri, {
+        fileService: this.fileService,
+        sketchesService: this.sketchesService,
+        labelProvider: this.labelProvider,
+        dialogService: this.dialogService,
       });
-      if (response === 1) {
-        // OK
-        const newSketchUri = new URI(sketchFileUri).parent.resolve(name);
-        const exists = await this.fileService.exists(newSketchUri);
-        if (exists) {
-          await remote.dialog.showMessageBox({
-            type: 'error',
-            title: nls.localize('vscode/dialog/dialogErrorMessage', 'Error'),
-            message: nls.localize(
-              'arduino/sketch/cantOpen',
-              'A folder named "{0}" already exists. Can\'t open sketch.',
-              name
-            ),
-          });
-          return undefined;
-        }
-        await this.fileService.createFolder(newSketchUri);
-        await this.fileService.move(
-          new URI(sketchFileUri),
-          new URI(newSketchUri.resolve(nameWithExt).toString())
-        );
-        return this.sketchService.getSketchFolder(newSketchUri.toString());
-      }
     }
   }
 }
@@ -217,8 +123,59 @@ export namespace OpenSketch {
     export const OPEN_SKETCH: Command = {
       id: 'arduino-open-sketch',
     };
-    export const OPEN_SKETCH__TOOLBAR: Command = {
-      id: 'arduino-open-sketch--toolbar',
-    };
+  }
+}
+
+export async function promptMoveSketch(
+  sketchFileUri: string | URI,
+  options: {
+    fileService: FileService;
+    sketchesService: SketchesService;
+    labelProvider: LabelProvider;
+    dialogService: DialogService;
+  }
+): Promise<Sketch | undefined> {
+  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 dialogService.showMessageBox({
+    title: nls.localize('arduino/sketch/moving', 'Moving'),
+    type: 'question',
+    buttons: [
+      nls.localize('vscode/issueMainService/cancel', 'Cancel'),
+      nls.localize('vscode/issueMainService/ok', 'OK'),
+    ],
+    message: nls.localize(
+      'arduino/sketch/movingMsg',
+      'The file "{0}" needs to be inside a sketch folder named "{1}".\nCreate this folder, move the file, and continue?',
+      nameWithExt,
+      name
+    ),
+  });
+  if (response === 1) {
+    // OK
+    const newSketchUri = uri.parent.resolve(name);
+    const exists = await fileService.exists(newSketchUri);
+    if (exists) {
+      await dialogService.showMessageBox({
+        type: 'error',
+        title: nls.localize('vscode/dialog/dialogErrorMessage', 'Error'),
+        message: nls.localize(
+          'arduino/sketch/cantOpen',
+          'A folder named "{0}" already exists. Can\'t open sketch.',
+          name
+        ),
+      });
+      return undefined;
+    }
+    await fileService.createFolder(newSketchUri);
+    await fileService.move(
+      uri,
+      new URI(newSketchUri.resolve(nameWithExt).toString())
+    );
+    return sketchesService.getSketchFolder(newSketchUri.toString());
   }
 }

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(),
       });
     }
   }