.eslintrc.js

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

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows]
+ - Version: [e.g. 2.0.0]
+
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/feature-request.yml

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

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/PULL_REQUEST_TEMPLATE.md

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

.github/dependabot.yml

@@ -1,15 +0,0 @@
-# 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,27 +0,0 @@
-# Used by the "Sync Labels" workflow
-# See: https://github.com/Financial-Times/github-label-sync#label-config-file
-
-- name: 'topic: accessibility'
-  color: '00ffff'
-  description: Enabling the use of the software by everyone
-- name: 'topic: CLI'
-  color: '00ffff'
-  description: Related to Arduino CLI
-- name: 'topic: 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'
-  description: Related to the Arduino Language Server
-- name: 'topic: serial monitor'
-  color: '00ffff'
-  description: Related to the Serial Monitor
-- name: 'topic: theia'
-  color: '00ffff'
-  description: Related to the Theia IDE framework
-- name: 'topic: theme'
-  color: '00ffff'
-  description: Related to GUI theming

.github/workflows/assets/linux.Dockerfile

@@ -1,63 +0,0 @@
-# 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,694 +1,176 @@
 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/**'
-      - '!.github/workflows/build.yml'
-      - '.vscode/**'
-      - 'docs/**'
-      - 'scripts/**'
-      - '!scripts/merge-channel-files.js'
-      - 'static/**'
-      - '*.md'
-  schedule:
-    - cron: '0 3 * * *' # run every day at 3AM (https://docs.github.com/en/actions/reference/events-that-trigger-workflows#scheduled-events-schedule)
-  workflow_run:
-    workflows:
-      - Push Container Images
     branches:
       - main
-    types:
-      - completed
-
-env:
-  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: '1.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.
+  schedule:
+    - cron: '0 3 * * *' # run every day at 3AM (https://docs.github.com/en/actions/reference/events-that-trigger-workflows#scheduled-events-schedule)
 
 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.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: ${{ 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
-
+        config:
+          - os: windows-latest
+          - os: ubuntu-latest
+          - os: macos-latest
+    runs-on: ${{ matrix.config.os }}
     timeout-minutes: 90
 
     steps:
-      - 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: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
-
-      - name: Install Node.js
-        if: runner.name != 'WINDOWS-SIGN-PC'
-        uses: actions/setup-node@v4
+      - name: Install Node.js 12.x
+        uses: actions/setup-node@v1
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          node-version: '12.14.1'
           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
-        if: fromJSON(matrix.config.container) == null && runner.name != 'WINDOWS-SIGN-PC'
-        uses: actions/setup-python@v5
+      - name: Install Python 2.7
+        uses: actions/setup-python@v2
         with:
-          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
+          python-version: '2.7'
 
       - 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 }}
-          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 || './' }}
+          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/') }}
         run: |
-          # See: https://www.electron.build/code-signing
-          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
+            # See: https://www.electron.build/code-signing
+            if [ "${{ runner.OS }}" = "macOS" ]; then
+              export CSC_LINK="${{ runner.temp }}/signing_certificate.p12"
+              # APPLE_SIGNING_CERTIFICATE_P12 secret was produced by following the procedure from:
+              # https://www.kencochrane.com/2020/08/01/build-and-sign-golang-binaries-for-macos-with-github-actions/#exporting-the-developer-certificate
+              echo "${{ secrets.APPLE_SIGNING_CERTIFICATE_P12 }}" | base64 --decode > "$CSC_LINK"
 
-          npx node-gyp install
-          yarn install
+              export CSC_KEY_PASSWORD="${{ secrets.KEYCHAIN_PASSWORD }}"
 
-          yarn --cwd arduino-ide-extension build
-          yarn --cwd electron-app rebuild
-          yarn --cwd electron-app build
-          yarn --cwd electron-app package
+            elif [ "${{ runner.OS }}" = "Windows" ]; then
+              export CSC_LINK="${{ runner.temp }}/signing_certificate.pfx"
+              echo "${{ secrets.WINDOWS_SIGNING_CERTIFICATE_PFX }}" | base64 --decode > "$CSC_LINK"
 
-      # 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"
+              export CSC_KEY_PASSWORD="${{ secrets.WINDOWS_SIGNING_CERTIFICATE_PASSWORD }}"
+            fi
 
-          # 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"
+            yarn --cwd ./electron/packager/
+            yarn --cwd ./electron/packager/ package
 
-      - 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'
+      - name: Upload [GitHub Actions]
+        uses: actions/upload-artifact@v2
         with:
-          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:
-      - select-targets
-      - build
-    if: always() && needs.build.result != 'skipped'
-    runs-on: ubuntu-latest
-
-    env:
-      BUILD_ARTIFACTS_FOLDER: build-artifacts
-
-    strategy:
-      matrix:
-        artifact: ${{ fromJson(needs.select-targets.outputs.artifact-matrix) }}
-
-    steps:
-      - name: Download job transfer artifact that contains ${{ matrix.artifact.name }} tester build
-        uses: actions/download-artifact@v4
-        with:
-          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@v4
-        with:
-          name: ${{ matrix.artifact.name }}
-          path: ${{ env.BUILD_ARTIFACTS_FOLDER }}/${{ matrix.artifact.path }}
+          name: build-artifacts
+          path: electron/build/dist/build-artifacts/
 
   changelog:
-    needs:
-      - build-type-determination
-      - build
+    needs: build
     runs-on: ubuntu-latest
     outputs:
       BODY: ${{ steps.changelog.outputs.BODY }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0 # To fetch all history for all branches and tags.
 
       - name: Generate Changelog
         id: changelog
         env:
-          IS_RELEASE: ${{ needs.build-type-determination.outputs.is-release }}
+          IS_RELEASE: ${{ startsWith(github.ref, 'refs/tags/') }}
         run: |
-          export LATEST_TAG=$(git describe --abbrev=0)
-          export GIT_LOG=$(git log --pretty=" - %s [%h]" $LATEST_TAG..HEAD | sed 's/ *$//g')
-          if [ "$IS_RELEASE" = true ]; then
-            export BODY=$(echo -e "$GIT_LOG")
-          else
-            export LATEST_TAG_WITH_LINK=$(echo "[$LATEST_TAG](https://github.com/arduino/arduino-ide/releases/tag/$LATEST_TAG)")
-            if [ -z "$GIT_LOG" ]; then
-                export BODY="There were no changes since version $LATEST_TAG_WITH_LINK."
-            else
-                export BODY=$(echo -e "Changes since version $LATEST_TAG_WITH_LINK:\n$GIT_LOG")
+            export LATEST_TAG=$(git describe --abbrev=0)
+            export GIT_LOG=$(git log --pretty=" - %s [%h]" $LATEST_TAG..HEAD | sed 's/ *$//g')
+            if [ "$IS_RELEASE" = true ]; then
+              export BODY=$(echo -e "$GIT_LOG")
+            else 
+              export LATEST_TAG_WITH_LINK=$(echo "[$LATEST_TAG](https://github.com/arduino/arduino-ide/releases/tag/$LATEST_TAG)")
+              if [ -z "$GIT_LOG" ]; then
+                  export BODY="There were no changes since version $LATEST_TAG_WITH_LINK."
+              else
+                  export BODY=$(echo -e "Changes since version $LATEST_TAG_WITH_LINK:\n$GIT_LOG")
+              fi
             fi
-          fi
-          echo -e "$BODY"
+            echo -e "$BODY"
+            OUTPUT_SAFE_BODY="${BODY//'%'/'%25'}"
+            OUTPUT_SAFE_BODY="${OUTPUT_SAFE_BODY//$'\n'/'%0A'}"
+            OUTPUT_SAFE_BODY="${OUTPUT_SAFE_BODY//$'\r'/'%0D'}"
+            echo "::set-output name=BODY::$OUTPUT_SAFE_BODY"
+            echo "$BODY" > CHANGELOG.txt
 
-          # 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 job transfer artifact
-        if: needs.build-type-determination.outputs.is-nightly == 'true'
-        uses: actions/upload-artifact@v4
+      - name: Upload Changelog [GitHub Actions]
+        if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main')
+        uses: actions/upload-artifact@v2
         with:
-          name: ${{ env.JOB_TRANSFER_ARTIFACT_PREFIX }}changelog
+          name: build-artifacts
           path: CHANGELOG.txt
 
   publish:
-    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'
+    needs: changelog
+    if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main')
     runs-on: ubuntu-latest
-
-    env:
-      ARTIFACTS_FOLDER: build-artifacts
-
-    environment: production
-
-    permissions:
-      id-token: write
-      contents: read
-
     steps:
-      - name: Download all job transfer artifacts
-        uses: actions/download-artifact@v4
+      - name: Download [GitHub Actions]
+        uses: actions/download-artifact@v2
         with:
-          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: build-artifacts
+          path: build-artifacts
 
       - name: Publish Nightly [S3]
-        run: |
-          aws s3 sync ${{ env.ARTIFACTS_FOLDER }} s3://${{ secrets.DOWNLOADS_BUCKET }}/arduino-ide/nightly
+        uses: docker://plugins/s3
+        env:
+          PLUGIN_SOURCE: "build-artifacts/*"
+          PLUGIN_STRIP_PREFIX: "build-artifacts/"
+          PLUGIN_TARGET: "/arduino-ide/nightly"
+          PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
   release:
-    needs:
-      - 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'
+    needs: changelog
+    if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
-
-    env:
-      ARTIFACTS_FOLDER: build-artifacts
-
-    environment: production
-
-    permissions:
-      id-token: write
-      contents: write
-
     steps:
-      - name: Download all job transfer artifacts
-        uses: actions/download-artifact@v4
+      - name: Download [GitHub Actions]
+        uses: actions/download-artifact@v2
         with:
-          merge-multiple: true
-          path: ${{ env.ARTIFACTS_FOLDER }}
-          pattern: ${{ env.JOB_TRANSFER_ARTIFACT_PREFIX }}*
+          name: build-artifacts
+          path: build-artifacts
 
       - name: Get Tag
         id: tag_name
         run: |
-          echo "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          echo ::set-output name=TAG_NAME::${GITHUB_REF#refs/tags/}
 
       - name: Publish Release [GitHub]
-        uses: svenstaro/upload-release-action@2.9.0
+        uses: svenstaro/upload-release-action@2.2.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           release_name: ${{ steps.tag_name.outputs.TAG_NAME }}
-          file: ${{ env.ARTIFACTS_FOLDER }}/*
+          file: build-artifacts/*
           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: 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
-    if: always() && needs.build.result != 'skipped'
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Remove unneeded job transfer artifacts
-        uses: geekyeggo/delete-artifact@v5
-        with:
-          name: ${{ env.JOB_TRANSFER_ARTIFACT_PREFIX }}*
+        uses: docker://plugins/s3
+        env:
+          PLUGIN_SOURCE: "build-artifacts/*"
+          PLUGIN_STRIP_PREFIX: "build-artifacts/"
+          PLUGIN_TARGET: "/arduino-ide"
+          PLUGIN_BUCKET: ${{ secrets.DOWNLOADS_BUCKET }}
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/check-certificates.yml

@@ -1,89 +1,38 @@
-# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/check-certificates.md
-name: Check Certificates
+name: Check for issues with signing certificates
 
-# See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
 on:
-  create:
-  push:
-    paths:
-      - '.github/workflows/check-certificates.ya?ml'
-  pull_request:
-    paths:
-      - '.github/workflows/check-certificates.ya?ml'
   schedule:
-    # Run every 10 hours.
-    - cron: '0 */10 * * *'
+    # run every 10 hours
+    - cron: "0 */10 * * *"
+  # workflow_dispatch event allows the workflow to be triggered manually.
+  # This could be used to run an immediate check after updating certificate secrets.
+  # See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows#workflow_dispatch
   workflow_dispatch:
-  repository_dispatch:
 
 env:
-  # Begin notifications when there are less than this many days remaining before expiration.
+  # Begin notifications when there are less than this many days remaining before expiration
   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 }}
-    needs: run-determination
-    if: needs.run-determination.outputs.result == 'true'
     runs-on: ubuntu-latest
+
     strategy:
       fail-fast: false
 
       matrix:
         certificate:
-          # Additional certificate definitions can be added to this list.
-          - identifier: macOS signing certificate # Text used to identify certificate in notifications.
-            certificate-secret: APPLE_SIGNING_CERTIFICATE_P12 # Name of the secret that contains the certificate.
-            password-secret: KEYCHAIN_PASSWORD # Name of the secret that contains the certificate password.
-            type: pkcs12
+          - identifier: macOS signing certificate # Text used to identify the certificate in notifications
+            certificate-secret: APPLE_SIGNING_CERTIFICATE_P12  # The name of the secret that contains the certificate
+            password-secret: KEYCHAIN_PASSWORD  # The name of the secret that contains the certificate password
           - identifier: Windows signing certificate
-            certificate-secret: INSTALLER_CERT_WINDOWS_CER
-            # The password for the Windows certificate is not needed, because its not a container, but a single certificate.
-            type: x509
+            certificate-secret: WINDOWS_SIGNING_CERTIFICATE_PFX
+            password-secret: WINDOWS_SIGNING_CERTIFICATE_PASSWORD
 
     steps:
       - name: Set certificate path environment variable
         run: |
-          # See: https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
+          # See: https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
           echo "CERTIFICATE_PATH=${{ runner.temp }}/certificate.p12" >> "$GITHUB_ENV"
 
       - name: Decode certificate
@@ -97,78 +46,59 @@ jobs:
           CERTIFICATE_PASSWORD: ${{ secrets[matrix.certificate.password-secret] }}
         run: |
           (
-            openssl ${{ matrix.certificate.type }} \
+            openssl pkcs12 \
               -in "${{ env.CERTIFICATE_PATH }}" \
-              -legacy \
-              -noout \
-              -passin env:CERTIFICATE_PASSWORD
+              -noout -passin env:CERTIFICATE_PASSWORD
           ) || (
             echo "::error::Verification of ${{ matrix.certificate.identifier }} failed!!!"
             exit 1
           )
 
+      # See: https://github.com/rtCamp/action-slack-notify
       - name: Slack notification of certificate verification failure
         if: failure()
+        uses: rtCamp/action-slack-notify@v2.1.0
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_WEBHOOK: ${{ secrets.TEAM_TOOLING_CHANNEL_SLACK_WEBHOOK }}
           SLACK_MESSAGE: |
             :warning::warning::warning::warning:
             WARNING: ${{ github.repository }} ${{ matrix.certificate.identifier }} verification failed!!!
             :warning::warning::warning::warning:
           SLACK_COLOR: danger
           MSG_MINIMAL: true
-        uses: rtCamp/action-slack-notify@v2
 
       - name: Get days remaining before certificate expiration date
         env:
           CERTIFICATE_PASSWORD: ${{ secrets[matrix.certificate.password-secret] }}
         id: get-days-before-expiration
         run: |
-          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
+          EXPIRATION_DATE="$(
+            (
+              openssl pkcs12 \
+                -in "${{ env.CERTIFICATE_PATH }}" \
+                -clcerts \
+                -nodes \
+                -passin env:CERTIFICATE_PASSWORD
+            ) | (
+              openssl x509 \
+                -noout \
+                -enddate
+            ) | (
+              grep \
+                --max-count=1 \
+                --only-matching \
+                --perl-regexp \
+                'notAfter=(\K.*)'
+            )
+          )"
 
           DAYS_BEFORE_EXPIRATION="$((($(date --utc --date="$EXPIRATION_DATE" +%s) - $(date --utc +%s)) / 60 / 60 / 24))"
 
-          # Display the expiration information in the log.
+          # Display the expiration information in the log
           echo "Certificate expiration date: $EXPIRATION_DATE"
           echo "Days remaining before expiration: $DAYS_BEFORE_EXPIRATION"
 
-          echo "days=$DAYS_BEFORE_EXPIRATION" >> $GITHUB_OUTPUT
+          echo "::set-output name=days::$DAYS_BEFORE_EXPIRATION"
 
       - name: Check if expiration notification period has been reached
         id: check-expiration
@@ -179,14 +109,14 @@ jobs:
           fi
 
       - name: Slack notification of pending certificate expiration
-        # Don't send spurious expiration notification if verification fails.
+        # Don't send spurious expiration notification if verification fails
         if: failure() && steps.check-expiration.outcome == 'failure'
+        uses: rtCamp/action-slack-notify@v2.1.0
         env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_WEBHOOK: ${{ secrets.TEAM_TOOLING_CHANNEL_SLACK_WEBHOOK }}
           SLACK_MESSAGE: |
             :warning::warning::warning::warning:
             WARNING: ${{ github.repository }} ${{ matrix.certificate.identifier }} will expire in ${{ steps.get-days-before-expiration.outputs.days }} days!!!
             :warning::warning::warning::warning:
           SLACK_COLOR: danger
           MSG_MINIMAL: true
-        uses: rtCamp/action-slack-notify@v2

.github/workflows/check-containers.yml

@@ -1,58 +0,0 @@
-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,91 +0,0 @@
-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'
-      - '**/package.json'
-      - '**.ts'
-      - 'i18n/**'
-  pull_request:
-    paths:
-      - '.github/workflows/check-i18n-task.ya?ml'
-      - '**/package.json'
-      - '**.ts'
-      - 'i18n/**'
-  workflow_dispatch:
-  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@v4
-
-      - name: Install Node.js 18.17
-        uses: actions/setup-node@v4
-        with:
-          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 install --immutable
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Check for errors
-        run: yarn i18n:check

.github/workflows/check-javascript.yml

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

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

@@ -1,66 +0,0 @@
-name: Compose full changelog
-
-on:
-  release:
-    types:
-      - edited
-
-env:
-  CHANGELOG_ARTIFACTS: changelog
-  # See: https://github.com/actions/setup-node/#readme
-  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@v4
-
-      - name: Install Node.js
-        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 "TAG_NAME=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-
-      - name: Create full changelog
-        id: full-changelog
-        run: |
-          yarn add @octokit/rest@19.0.13 --ignore-workspace-root-check
-          mkdir "${{ github.workspace }}/${{ env.CHANGELOG_ARTIFACTS }}"
-
-          # Get the changelog file name to build
-          CHANGELOG_FILE_NAME="${{ steps.tag_name.outputs.TAG_NAME }}-$(date +%s).md"
-
-          # Create manifest file pointing to latest changelog file name
-          echo "$CHANGELOG_FILE_NAME" >> "${{ github.workspace }}/${{ env.CHANGELOG_ARTIFACTS }}/latest.txt"
-
-          # Compose changelog
-          yarn run compose-changelog "${{ github.workspace }}/${{ env.CHANGELOG_ARTIFACTS }}/$CHANGELOG_FILE_NAME"
-
-      - name: 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]
-        run: |
-          aws s3 sync ${{ env.CHANGELOG_ARTIFACTS }} s3://${{ secrets.DOWNLOADS_BUCKET }}/arduino-ide/changelog

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

@@ -1,52 +0,0 @@
-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
-    - cron: '0 1 * * *'
-
-jobs:
-  push-to-transifex:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install Node.js 18.17
-        uses: actions/setup-node@v4
-        with:
-          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 install --immutable
-
-      - name: Run i18n:push script
-        run: yarn run i18n:push
-        env:
-          TRANSIFEX_ORGANIZATION: ${{ secrets.TRANSIFEX_ORGANIZATION }}
-          TRANSIFEX_PROJECT: ${{ secrets.TRANSIFEX_PROJECT }}
-          TRANSIFEX_RESOURCE: ${{ secrets.TRANSIFEX_RESOURCE }}
-          TRANSIFEX_API_KEY: ${{ secrets.TRANSIFEX_API_KEY }}

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

@@ -1,60 +0,0 @@
-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
-    - cron: '0 2 * * 1'
-
-jobs:
-  pull-from-transifex:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install Node.js 18.17
-        uses: actions/setup-node@v4
-        with:
-          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 install --immutable
-
-      - name: Run i18n:pull script
-        run: yarn run i18n:pull
-        env:
-          TRANSIFEX_ORGANIZATION: ${{ secrets.TRANSIFEX_ORGANIZATION }}
-          TRANSIFEX_PROJECT: ${{ secrets.TRANSIFEX_PROJECT }}
-          TRANSIFEX_RESOURCE: ${{ secrets.TRANSIFEX_RESOURCE }}
-          TRANSIFEX_API_KEY: ${{ secrets.TRANSIFEX_API_KEY }}
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          commit-message: Updated translation files
-          title: Update translation files
-          branch: i18n/translations-update
-          author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

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

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

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

.github/workflows/test-javascript.yml

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

@@ -1,69 +0,0 @@
-name: themes-weekly-pull
-
-on:
-  schedule:
-    # run every friday at 5AM
-    - cron: '0 5 * * 5'
-  workflow_dispatch:
-
-env:
-  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: '1.21'
-  NODE_VERSION: '18.17'
-
-jobs:
-  pull-from-jsonbin:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - 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 install --immutable
-
-      - name: Run themes:pull script
-        run: yarn run themes:pull
-        env:
-          JSONBIN_MASTER_KEY: ${{ secrets.JSONBIN_MASTER_KEY }}
-          JSONBIN_ID: ${{ secrets.JSONBIN_ID }}
-
-      - name: Generate dark tokens
-        run: npx token-transformer scripts/themes/tokens/arduino-tokens.json scripts/themes/tokens/dark.json core,ide-default,ide-dark,theia core,ide-default,ide-dark
-
-      - name: Generate default tokens
-        run: npx token-transformer scripts/themes/tokens/arduino-tokens.json scripts/themes/tokens/default.json core,ide-default,theia core,ide-default
-
-      - name: Run themes:generate script
-        run: yarn run themes:generate
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          commit-message: Updated themes
-          title: Update themes
-          branch: themes/themes-update
-          author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

.gitignore

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

.prettierignore

@@ -1,11 +0,0 @@
-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.json

@@ -1,28 +0,0 @@
-{
-  "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

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

.vscode/settings.json

@@ -1,12 +1,21 @@
 {
+  "tslint.enable": true,
+  "tslint.configFile": "./tslint.json",
+  "editor.formatOnSave": true,
   "files.exclude": {
     "**/lib": false
   },
-  "search.exclude": {
-    "arduino-ide-extension/src/test/node/__test_sketchbook__": true
+  "editor.insertSpaces": true,
+  "editor.detectIndentation": false,
+  "[typescript]": {
+    "editor.tabSize": 4
   },
-  "typescript.tsdk": "node_modules/typescript/lib",
-  "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit"
-  }
+  "[json]": {
+    "editor.tabSize": 2
+  },
+  "[jsonc]": {
+    "editor.tabSize": 2
+  },
+  "files.insertFinalNewline": true,
+  "typescript.tsdk": "node_modules/typescript/lib"
 }

.vscode/tasks.json

@@ -1,14 +1,13 @@
 {
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
   "version": "2.0.0",
   "tasks": [
     {
-      "label": "Rebuild App",
+      "label": "Arduino IDE - Rebuild Electron App",
       "type": "shell",
-      "command": "yarn rebuild",
+      "command": "yarn rebuild:browser && yarn rebuild:electron",
       "group": "build",
-      "options": {
-        "cwd": "${workspaceFolder}/electron-app"
-      },
       "presentation": {
         "reveal": "always",
         "panel": "new",
@@ -16,7 +15,18 @@
       }
     },
     {
-      "label": "Watch Extension",
+      "label": "Arduino IDE - Start Browser App",
+      "type": "shell",
+      "command": "yarn --cwd ./browser-app start",
+      "group": "build",
+      "presentation": {
+        "reveal": "always",
+        "panel": "new",
+        "clear": true
+      }
+    },
+    {
+      "label": "Arduino IDE - Watch IDE Extension",
       "type": "shell",
       "command": "yarn --cwd ./arduino-ide-extension watch",
       "group": "build",
@@ -25,9 +35,20 @@
         "panel": "new",
         "clear": false
       }
+    }
+    {
+      "label": "Arduino IDE - Watch Browser App",
+      "type": "shell",
+      "command": "yarn --cwd ./browser-app watch",
+      "group": "build",
+      "presentation": {
+        "reveal": "always",
+        "panel": "new",
+        "clear": false
+      }
     },
     {
-      "label": "Watch App",
+      "label": "Arduino IDE - Watch Electron App",
       "type": "shell",
       "command": "yarn --cwd ./electron-app watch",
       "group": "build",
@@ -38,9 +59,20 @@
       }
     },
     {
-      "label": "Watch All",
+      "label": "Arduino IDE - Watch All [Browser]",
       "type": "shell",
-      "dependsOn": ["Watch Extension", "Watch App"]
+      "dependsOn": [
+        "Arduino IDE - Watch IDE Extension",
+        "Arduino IDE - Watch Browser App"
+      ]
+    },
+    {
+      "label": "Arduino IDE - Watch All [Electron]",
+      "type": "shell",
+      "dependsOn": [
+        "Arduino IDE - Watch IDE Extension",
+        "Arduino IDE - Watch Electron App"
+      ]
     }
   ]
 }

BUILDING.md

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

Dockerfile

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

LICENSE.txt

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

README.md

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

arduino-ide-extension/README.md

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

arduino-ide-extension/package.json

@@ -1,141 +1,97 @@
 {
   "name": "arduino-ide-extension",
-  "version": "2.3.7",
+  "version": "2.0.0-beta.1",
   "description": "An extension for Theia building the Arduino IDE",
-  "license": "AGPL-3.0-or-later",
+  "license": "MIT",
   "scripts": {
-    "prepare": "yarn download-cli && yarn download-fwuploader && yarn download-ls && yarn copy-i18n && yarn download-examples",
+    "prepare": "yarn download-cli && yarn download-ls && yarn clean && yarn download-examples && yarn build",
     "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": "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 .",
-    "prebuild": "rimraf lib",
-    "build": "tsc",
-    "build:dev": "yarn build",
-    "postbuild": "ncp ./src/node/cli-protocol/ ./lib/node/cli-protocol/",
+    "lint": "tslint -c ./tslint.json --project ./tsconfig.json",
+    "build": "tsc && ncp ./src/node/cli-protocol/ ./lib/node/cli-protocol/ && yarn lint",
     "watch": "tsc -w",
-    "test": "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"
+    "test": "mocha \"./lib/test/**/*.test.js\"",
+    "test:watch": "mocha --watch --watch-files lib \"./lib/test/**/*.test.js\""
   },
   "dependencies": {
-    "@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/auth0-js": "^9.21.3",
-    "@types/btoa": "^1.2.3",
+    "@grpc/grpc-js": "^1.1.1",
+    "@theia/application-package": "next",
+    "@theia/core": "next",
+    "@theia/editor": "next",
+    "@theia/filesystem": "next",
+    "@theia/git": "next",
+    "@theia/markers": "next",
+    "@theia/monaco": "next",
+    "@theia/navigator": "next",
+    "@theia/outline-view": "next",
+    "@theia/preferences": "next",
+    "@theia/output": "next",
+    "@theia/search-in-workspace": "next",
+    "@theia/terminal": "next",
+    "@theia/workspace": "next",
     "@types/dateformat": "^3.0.1",
+    "@types/deepmerge": "^2.2.0",
+    "@types/glob": "^5.0.35",
     "@types/google-protobuf": "^3.7.2",
     "@types/js-yaml": "^3.12.2",
-    "@types/jsdom": "^21.1.1",
     "@types/lodash.debounce": "^4.0.6",
-    "@types/node-fetch": "^2.5.7",
-    "@types/p-queue": "^2.3.1",
+    "@types/ncp": "^2.0.4",
     "@types/ps-tree": "^1.1.0",
+    "@types/react-select": "^3.0.0",
+    "@types/react-tabs": "^2.3.2",
+    "@types/sinon": "^7.5.2",
     "@types/temp": "^0.8.34",
-    "arduino-serial-plotter-webapp": "0.2.0",
-    "async-mutex": "^0.3.0",
-    "auth0-js": "^9.23.2",
-    "btoa": "^1.2.1",
-    "classnames": "^2.3.1",
-    "cross-fetch": "^3.1.5",
+    "@types/which": "^1.3.1",
+    "ajv": "^6.5.3",
+    "css-element-queries": "^1.2.0",
     "dateformat": "^3.0.3",
     "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",
-    "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-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",
+    "fuzzy": "^0.1.3",
+    "glob": "^7.1.6",
+    "google-protobuf": "^3.11.4",
     "lodash.debounce": "^4.0.8",
-    "minimatch": "^3.1.2",
-    "node-fetch": "^2.6.1",
-    "node-log-rotate": "^0.1.5",
-    "open": "^8.0.6",
-    "p-debounce": "^2.1.0",
-    "p-queue": "^2.4.2",
-    "process": "^0.11.10",
+    "js-yaml": "^3.13.1",
+    "ncp": "^2.0.0",
+    "p-queue": "^5.0.0",
     "ps-tree": "^1.2.0",
-    "query-string": "^7.0.1",
-    "react-disable": "^0.1.1",
-    "react-markdown": "^8.0.0",
-    "react-perfect-scrollbar": "^1.5.8",
-    "react-select": "^5.6.0",
-    "react-tabs": "^6.1.0",
-    "react-window": "^1.8.6",
+    "react-disable": "^0.1.0",
+    "react-select": "^3.0.4",
+    "react-tabs": "^3.1.2",
     "semver": "^7.3.2",
     "string-natural-compare": "^2.0.3",
     "temp": "^0.9.1",
-    "temp-dir": "^2.0.0",
     "tree-kill": "^1.2.1",
-    "util": "^0.12.5",
-    "vscode-arduino-api": "^0.1.2"
+    "upath": "^1.1.2",
+    "which": "^1.3.1"
   },
   "devDependencies": {
-    "@octokit/rest": "^18.12.0",
     "@types/chai": "^4.2.7",
-    "@types/mocha": "^10.0.0",
-    "@types/react-window": "^1.8.5",
-    "@xhmikosr/downloader": "^13.0.1",
+    "@types/chai-string": "^1.4.2",
+    "@types/mocha": "^5.2.7",
     "chai": "^4.2.0",
-    "cross-env": "^7.0.3",
+    "chai-string": "^1.5.0",
     "decompress": "^4.2.0",
-    "decompress-tarbz2": "^4.1.1",
     "decompress-targz": "^4.1.1",
     "decompress-unzip": "^4.0.1",
-    "grpc_tools_node_protoc_ts": "^5.3.3",
-    "mocha": "^10.2.0",
-    "mockdate": "^3.0.5",
+    "download": "^7.1.0",
+    "grpc_tools_node_protoc_ts": "^4.1.0",
+    "mocha": "^7.0.0",
     "moment": "^2.24.0",
-    "ncp": "^2.0.0",
-    "rimraf": "^5.0.0"
+    "protoc": "^1.0.4",
+    "shelljs": "^0.8.3",
+    "sinon": "^9.0.1",
+    "uuid": "^3.2.1",
+    "yargs": "^11.1.0"
   },
   "optionalDependencies": {
-    "@pingghost/protoc": "^1.0.2",
-    "grpc-tools": "^1.12.4"
+    "grpc-tools": "^1.9.0"
   },
   "mocha": {
     "require": [
-      "reflect-metadata/Reflect",
-      "ignore-styles"
+      "reflect-metadata/Reflect"
     ],
     "reporter": "spec",
     "colors": true,
@@ -150,42 +106,24 @@
     "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"
+      "frontend": "lib/browser/boards/quick-open/boards-quick-open-module"
     },
     {
       "electronMain": "lib/electron-main/arduino-electron-main-module"
     }
   ],
   "arduino": {
-    "arduino-cli": {
-      "version": "1.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"
+    "cli": {
+      "version": "20210212"
     }
   }
 }

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

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

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

@@ -1,95 +1,141 @@
 // @ts-check
 
 (async () => {
-  const path = require('path');
-  const semver = require('semver');
-  const moment = require('moment');
-  const downloader = require('./downloader');
-  const { taskBuildFromGit } = require('./utils');
 
-  const version = (() => {
-    const pkg = require(path.join(__dirname, '..', 'package.json'));
-    if (!pkg) {
-      return undefined;
-    }
+    const fs = require('fs');
+    const path = require('path');
+    const temp = require('temp');
+    const shell = require('shelljs');
+    const semver = require('semver');
+    const moment = require('moment');
+    const downloader = require('./downloader');
 
-    const { arduino } = pkg;
-    if (!arduino) {
-      return undefined;
-    }
-
-    const cli = arduino['arduino-cli'];
-    if (!cli) {
-      return undefined;
-    }
-
-    const { version } = cli;
-    return version;
-  })();
-
-  if (!version) {
-    console.log(`Could not retrieve CLI version info from the 'package.json'.`);
-    process.exit(1);
-  }
-
-  const { platform, arch } = process;
-  const resourcesFolder = path.join(
-    __dirname,
-    '..',
-    'src',
-    'node',
-    'resources'
-  );
-  const cliName = `arduino-cli${platform === 'win32' ? '.exe' : ''}`;
-  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';
-        case 'linux': {
-          switch (arch) {
-            case 'arm':
-              return 'Linux_ARMv7.tar.gz';
-            case 'arm64':
-              return 'Linux_ARM64.tar.gz';
-            case 'x64':
-              return 'Linux_64bit.tar.gz';
-            default:
-              return undefined;
-          }
+    const version = (() => {
+        const pkg = require(path.join(__dirname, '..', 'package.json'));
+        if (!pkg) {
+            return undefined;
         }
-        default:
-          return undefined;
-      }
+
+        const { arduino } = pkg;
+        if (!arduino) {
+            return undefined;
+        }
+
+        const { cli } = arduino;
+        if (!cli) {
+            return undefined;
+        }
+
+        const { version } = cli;
+        return version;
     })();
-    if (!suffix) {
-      console.log(`The CLI is not available for ${platform} ${arch}.`);
-      process.exit(1);
+
+    if (!version) {
+        shell.echo(`Could not retrieve CLI version info from the 'package.json'.`);
+        shell.exit(1);
     }
-    if (semver.valid(version)) {
-      const url = `https://downloads.arduino.cc/arduino-cli/arduino-cli_${version}_${suffix}`;
-      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}`;
-      console.log(
-        `🌙  Identified nightly version of the CLI. Downloading version ${version} from '${url}'`
-      );
-      await downloader.downloadUnzipFile(url, destinationPath, 'arduino-cli');
+
+    const { platform, arch } = process;
+    const buildFolder = path.join(__dirname, '..', 'build');
+    const cliName = `arduino-cli${platform === 'win32' ? '.exe' : ''}`;
+    const destinationPath = path.join(buildFolder, cliName);
+
+    if (typeof version === 'string') {
+        const suffix = (() => {
+            switch (platform) {
+                case 'darwin': return 'macOS_64bit.tar.gz';
+                case 'win32': return 'Windows_64bit.zip';
+                case 'linux': {
+                    switch (arch) {
+                        case 'arm': return 'Linux_ARMv7.tar.gz';
+                        case 'arm64': return 'Linux_ARM64.tar.gz';
+                        case 'x64': return 'Linux_64bit.tar.gz';
+                        default: return undefined;
+                    }
+                }
+                default: return undefined;
+            }
+        })();
+        if (!suffix) {
+            shell.echo(`The CLI is not available for ${platform} ${arch}.`);
+            shell.exit(1);
+        }
+        if (semver.valid(version)) {
+            const url = `https://downloads.arduino.cc/arduino-cli/arduino-cli_${version}_${suffix}`;
+            shell.echo(`📦  Identified released version of the CLI. Downloading version ${version} from '${url}'`);
+            await downloader.downloadUnzipFile(url, destinationPath, 'arduino-cli');
+        } else if (moment(version, 'YYYYMMDD', true).isValid()) {
+            const url = `https://downloads.arduino.cc/arduino-cli/nightly/arduino-cli_nightly-${version}_${suffix}`;
+            shell.echo(`🌙  Identified nightly version of the CLI. Downloading version ${version} from '${url}'`);
+            await downloader.downloadUnzipFile(url, destinationPath, 'arduino-cli');
+        } else {
+            shell.echo(`🔥  Could not interpret 'version': ${version}`);
+            shell.exit(1);
+        }
     } else {
-      console.log(`🔥  Could not interpret 'version': ${version}`);
-      process.exit(1);
+
+        // We assume an object with `owner`, `repo`, commitish?` properties.
+        const { owner, repo, commitish } = version;
+        if (!owner) {
+            shell.echo(`Could not retrieve 'owner' from ${JSON.stringify(version)}`);
+            shell.exit(1);
+        }
+        if (!repo) {
+            shell.echo(`Could not retrieve 'repo' from ${JSON.stringify(version)}`);
+            shell.exit(1);
+        }
+        const url = `https://github.com/${owner}/${repo}.git`;
+        shell.echo(`Building CLI from ${url}. Commitish: ${commitish ? commitish : 'HEAD'}`);
+
+        if (fs.existsSync(destinationPath)) {
+            shell.echo(`Skipping the CLI build because it already exists: ${destinationPath}`);
+            return;
+        }
+
+        if (shell.mkdir('-p', buildFolder).code !== 0) {
+            shell.echo('Could not create build folder.');
+            shell.exit(1);
+        }
+
+        const tempRepoPath = temp.mkdirSync();
+        shell.echo(`>>> Cloning CLI source to ${tempRepoPath}...`);
+        if (shell.exec(`git clone ${url} ${tempRepoPath}`).code !== 0) {
+            shell.exit(1);
+        }
+        shell.echo('<<< Cloned CLI repo.')
+
+        if (commitish) {
+            shell.echo(`>>> Checking out ${commitish}...`);
+            if (shell.exec(`git -C ${tempRepoPath} checkout ${commitish}`).code !== 0) {
+                shell.exit(1);
+            }
+            shell.echo(`<<< Checked out ${commitish}.`);
+        }
+
+        shell.echo(`>>> Building the CLI...`);
+        if (shell.exec('go build', { cwd: tempRepoPath }).code !== 0) {
+            shell.exit(1);
+        }
+        shell.echo('<<< CLI build done.')
+
+        if (!fs.existsSync(path.join(tempRepoPath, cliName))) {
+            shell.echo(`Could not find the CLI at ${path.join(tempRepoPath, cliName)}.`);
+            shell.exit(1);
+        }
+
+        const builtCliPath = path.join(tempRepoPath, cliName);
+        shell.echo(`>>> Copying CLI from ${builtCliPath} to ${destinationPath}...`);
+        if (shell.cp(builtCliPath, destinationPath).code !== 0) {
+            shell.exit(1);
+        }
+        shell.echo(`<<< Copied the CLI.`);
+
+        shell.echo('<<< Verifying CLI...');
+        if (!fs.existsSync(destinationPath)) {
+            shell.exit(1);
+        }
+        shell.echo('>>> Verified CLI.');
+
     }
-  } else {
-    taskBuildFromGit(version, destinationPath, 'CLI');
-  }
+
 })();

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

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

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

@@ -1,102 +0,0 @@
-// @ts-check
-
-(async () => {
-  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'));
-    if (!pkg) {
-      return undefined;
-    }
-
-    const { arduino } = pkg;
-    if (!arduino) {
-      return undefined;
-    }
-
-    const fwuploader = arduino['arduino-fwuploader'];
-    if (!fwuploader) {
-      return undefined;
-    }
-
-    const { version } = fwuploader;
-    return version;
-  })();
-
-  if (!version) {
-    console.log(
-      `Could not retrieve Firmware Uploader version info from the 'package.json'.`
-    );
-    process.exit(1);
-  }
-
-  const { platform, arch } = process;
-  const resourcesFolder = path.join(
-    __dirname,
-    '..',
-    'src',
-    'node',
-    'resources'
-  );
-  const fwuploderName = `arduino-fwuploader${
-    platform === 'win32' ? '.exe' : ''
-  }`;
-  const destinationPath = path.join(resourcesFolder, fwuploderName);
-
-  if (typeof version === 'string') {
-    const suffix = (() => {
-      switch (platform) {
-        case 'darwin':
-          switch (arch) {
-            case 'arm64':
-              return 'macOS_ARM64.tar.gz';
-            case 'x64':
-              return 'macOS_64bit.tar.gz';
-            default:
-              return undefined;
-          }
-        case 'win32':
-          return 'Windows_64bit.zip';
-        case 'linux': {
-          switch (arch) {
-            case 'arm':
-              return 'Linux_ARMv7.tar.gz';
-            case 'arm64':
-              return 'Linux_ARM64.tar.gz';
-            case 'x64':
-              return 'Linux_64bit.tar.gz';
-            default:
-              return undefined;
-          }
-        }
-        default:
-          return undefined;
-      }
-    })();
-    if (!suffix) {
-      console.log(
-        `The Firmware Uploader is not available for ${platform} ${arch}.`
-      );
-      process.exit(1);
-    }
-    if (semver.valid(version)) {
-      const url = `https://downloads.arduino.cc/arduino-fwuploader/arduino-fwuploader_${version}_${suffix}`;
-      console.log(
-        `📦  Identified released version of the Firmware Uploader. Downloading version ${version} from '${url}'`
-      );
-      await downloader.downloadUnzipFile(
-        url,
-        destinationPath,
-        'arduino-fwuploader'
-      );
-    } else {
-      console.log(`🔥  Could not interpret 'version': ${version}`);
-      process.exit(1);
-    }
-  } else {
-    taskBuildFromGit(version, destinationPath, 'Firmware Uploader');
-  }
-})();

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

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

arduino-ide-extension/scripts/downloader.js

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

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

@@ -1,88 +1,82 @@
 // @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 { 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 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 defaultVersion = {
-      owner: 'arduino',
-      repo: 'arduino-cli',
-      commitish: undefined,
-    };
-    const { arduino } = pkg;
-    if (!arduino) {
-      return defaultVersion;
-    }
+    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 cli = arduino['arduino-cli'];
-    if (!cli) {
-      return defaultVersion;
-    }
+        const { arduino } = pkg;
+        if (!arduino) {
+            return { owner: 'arduino', repo: 'arduino-cli' };
+        }
 
-    const { version } = cli;
-    if (!version) {
-      return defaultVersion;
-    }
+        const { cli } = arduino;
+        if (!cli) {
+            return { owner: 'arduino', repo: 'arduino-cli' };
+        }
 
-    if (typeof version === 'string') {
-      return defaultVersion;
-    }
+        const { version } = cli;
+        if (!version) {
+            return { owner: 'arduino', repo: 'arduino-cli' };
+        }
 
-    // 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);
-    }
+        if (typeof version === 'string') {
+            return { owner: 'arduino', repo: 'arduino-cli' };
+        }
 
-    return { owner, repo, commitish };
-  })();
+        // 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 { 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.
-  /*
+        return { owner, repo, commitish };
+    })();
+
+    const url = `https://github.com/${owner}/${repo}.git`;
+    shell.echo(`>>> Cloning repository from '${url}'...`);
+    if (shell.exec(`git clone ${url} ${repository}`).code !== 0) {
+        shell.exit(1);
+    }
+    shell.echo(`<<< Repository cloned.`);
+
+    const { platform } = process;
+    const build = path.join(__dirname, '..', 'build');
+    const cli = path.join(build, `arduino-cli${platform === 'win32' ? '.exe' : ''}`);
+    const versionJson = shell.exec(`${cli} version --format json`).trim();
+    if (!versionJson) {
+        shell.echo(`Could not retrieve the CLI version from ${cli}.`);
+        shell.exit(1);
+    }
+    // As of today (28.01.2021), the `VersionString` can be one of the followings:
+    //  - `nightly-YYYYMMDD` stands for the nightly build, we use the , the `commitish` from the `package.json` to check out the code.
+    //  - `0.0.0-git` for local builds, we use the `commitish` from the `package.json` to check out the code and generate the APIs.
+    //  - `git-snapshot` for local build executed via `task build`. We do not do this.
+    //  - rest, we assume it is a valid semver and has the corresponding tagged code, we use the tag to generate the APIs from the `proto` files.
+    /*
     {
       "Application": "arduino-cli",
       "VersionString": "nightly-20210126",
@@ -90,200 +84,73 @@
       "Status": "alpha",
       "Date": "2021-01-26T01:46:31Z"
     }
-  */
-  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) {
-      console.log(`>>> Checking out commitish: '${commitish}'...`);
-      exec('git', ['-C', repoFolder, 'checkout', commitish], {
-        logStdout: true,
-      });
-      console.log(`<<< Checked out commitish: '${commitish}'.`);
-    } else {
-      console.log(
-        `WARN: no 'git checkout'. Generating from the HEAD revision.`
-      );
-    }
-
-    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.`);
-    }
-
-    return rpcFolder;
-  }
-
-  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 versionObject = JSON.parse(versionJson);
     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 (version && !version.startsWith('nightly-') && version !== '0.0.0-git' && version !== 'git-snapshot') {
+        shell.echo(`>>> Checking out tagged version: '${version}'...`);
+        shell.exec(`git -C ${repository} fetch --all --tags`);
+        if (shell.exec(`git -C ${repository} checkout tags/${version} -b ${version}`).code !== 0) {
+            shell.exit(1);
+        }
+        shell.echo(`<<< Checked out tagged version: '${commitish}'.`);
+    } else if (commitish) {
+        shell.echo(`>>> Checking out commitish from 'package.json': '${commitish}'...`);
+        if (shell.exec(`git -C ${repository} checkout ${commitish}`).code !== 0) {
+            shell.exit(1);
+        }
+        shell.echo(`<<< Checked out commitish from 'package.json': '${commitish}'.`);
+    } else if (versionObject.Commit) {
+        shell.echo(`>>> Checking out commitish from the CLI: '${versionObject.Commit}'...`);
+        if (shell.exec(`git -C ${repository} checkout ${versionObject.Commit}`).code !== 0) {
+            shell.exit(1);
+        }
+        shell.echo(`<<< Checked out commitish from the CLI: '${versionObject.Commit}'.`);
+    } else {
+        shell.echo(`WARN: no 'git checkout'. Generating from the HEAD revision.`);
+    }
 
-  if (!protosFolder) {
-    console.log(`Could not get proto files: missing commitish or version.`);
-    process.exit(1);
-  }
+    shell.echo('>>> Generating TS/JS API from:');
+    if (shell.exec(`git -C ${repository} rev-parse --abbrev-ref HEAD`).code !== 0) {
+        shell.exit(1);
+    }
 
-  const protos = await globProtos(protosFolder);
+    const rpc = path.join(repository, 'rpc');
+    const out = path.join(__dirname, '..', 'src', 'node', 'cli-protocol');
+    shell.mkdir('-p', out);
 
-  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);
-  }
+    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);
+    }
 
-  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.
-    exec(
-      'grpc_tools_node_protoc',
-      [
-        `--js_out=import_style=commonjs,binary:${out}`,
-        `--grpc_out=generate_package_definition:${out}`,
-        '-I',
-        protosFolder,
-        ...protos,
-      ],
-      { logStdout: true }
-    );
+    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);
+    }
 
     // Generate the `.d.ts` files for JS.
-    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 });
-  }
+    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.');
 
-  console.log('<<< Generation was successful.');
 })();

arduino-ide-extension/scripts/utils.js

@@ -1,143 +0,0 @@
-// @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`.
- *
- * @param version {object} the version object.
- * @param destinationPath {string} the absolute path of the output binary. For example, `C:\\folder\\arduino-cli.exe` or `/path/to/arduino-language-server`
- * @param taskName {string} for the CLI logging . Can be `'CLI'` or `'language-server'`, etc.
- */
-exports.goBuildFromGit = (version, destinationPath, taskName) => {
-  return buildFromGit('go', version, destinationPath, taskName);
-};
-
-/**
- * The `command` 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');
-
-  // We assume an object with `owner`, `repo`, commitish?` properties.
-  if (typeof version !== 'object') {
-    console.log(
-      `Expected a \`{ owner, repo, commitish }\` object. Got <${version}> instead.`
-    );
-  }
-  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);
-  }
-  const url = `https://github.com/${owner}/${repo}.git`;
-  console.log(
-    `Building ${taskName} from ${url}. Commitish: ${
-      commitish ? commitish : 'HEAD'
-    }`
-  );
-
-  if (fs.existsSync(destinationPath)) {
-    console.log(
-      `Skipping the ${taskName} build because it already exists: ${destinationPath}`
-    );
-    return;
-  }
-
-  const resourcesFolder = path.join(
-    __dirname,
-    '..',
-    'src',
-    'node',
-    'resources'
-  );
-  fs.mkdirSync(resourcesFolder, { recursive: true });
-
-  const tempRepoPath = temp.mkdirSync();
-  console.log(`>>> Cloning ${taskName} source to ${tempRepoPath}...`);
-  exec('git', ['clone', url, tempRepoPath], { logStdout: true });
-  console.log(`<<< Cloned ${taskName} repo.`);
-
-  if (commitish) {
-    console.log(`>>> Checking out ${commitish}...`);
-    exec('git', ['-C', tempRepoPath, 'checkout', commitish], {
-      logStdout: true,
-    });
-    console.log(`<<< Checked out ${commitish}.`);
-  }
-
-  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))) {
-    console.log(
-      `Could not find the ${taskName} at ${path.join(tempRepoPath, binName)}.`
-    );
-    process.exit(1);
-  }
-
-  const binPath = path.join(tempRepoPath, binName);
-  console.log(
-    `>>> Copying ${taskName} from ${binPath} to ${destinationPath}...`
-  );
-  fs.copyFileSync(binPath, destinationPath);
-  console.log(`<<< Copied the ${taskName}.`);
-
-  console.log(`<<< Verifying ${taskName}...`);
-  if (!fs.existsSync(destinationPath)) {
-    process.exit(1);
-  }
-  console.log(`>>> Verified ${taskName}.`);
-}

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

@@ -1,16 +0,0 @@
-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-commands.ts

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

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

@@ -1,479 +1,410 @@
+const debounce = require('lodash.debounce');
+import { MAIN_MENU_BAR, MenuContribution, MenuModelRegistry, SelectionService, ILogger } from '@theia/core';
+import {
+    ContextMenuRenderer,
+    FrontendApplication, FrontendApplicationContribution,
+    OpenerService, StatusBar, StatusBarAlignment
+} 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 { 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 { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import { CommandContribution, CommandRegistry } from '@theia/core/lib/common/command';
 import { MessageService } from '@theia/core/lib/common/message-service';
-import { 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 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 URI from '@theia/core/lib/common/uri';
+import { EditorMainMenu, EditorManager } from '@theia/editor/lib/browser';
+import { FileDialogService } from '@theia/filesystem/lib/browser/file-dialog';
+import { ProblemContribution } from '@theia/markers/lib/browser/problem/problem-contribution';
 import { MonacoMenus } from '@theia/monaco/lib/browser/monaco-menu';
-import { FileNavigatorCommands } from '@theia/navigator/lib/browser/navigator-contribution';
+import { FileNavigatorContribution } from '@theia/navigator/lib/browser/navigator-contribution';
+import { OutlineViewContribution } from '@theia/outline-view/lib/browser/outline-view-contribution';
+import { OutputContribution } from '@theia/output/lib/browser/output-contribution';
+import { ScmContribution } from '@theia/scm/lib/browser/scm-contribution';
+import { SearchInWorkspaceFrontendContribution } from '@theia/search-in-workspace/lib/browser/search-in-workspace-frontend-contribution';
 import { TerminalMenus } from '@theia/terminal/lib/browser/terminal-frontend-contribution';
+import { inject, injectable, postConstruct } from 'inversify';
+import * as React from 'react';
+import { remote } from 'electron';
+import { MainMenuManager } from '../common/main-menu-manager';
+import { BoardsService, CoreService, Port, SketchesService, ExecutableService } from '../common/protocol';
+import { ArduinoDaemon } from '../common/protocol/arduino-daemon';
+import { ConfigService } from '../common/protocol/config-service';
+import { FileSystemExt } from '../common/protocol/filesystem-ext';
+import { ArduinoCommands } from './arduino-commands';
+import { BoardsConfig } from './boards/boards-config';
+import { BoardsConfigDialog } from './boards/boards-config-dialog';
+import { BoardsDataStore } from './boards/boards-data-store';
 import { BoardsServiceProvider } from './boards/boards-service-provider';
 import { BoardsToolBarItem } from './boards/boards-toolbar-item';
+import { EditorMode } from './editor-mode';
 import { ArduinoMenus } from './menu/arduino-menus';
-import { MonitorViewContribution } from './serial/monitor/monitor-view-contribution';
-import { SerialPlotterContribution } from './serial/plotter/plotter-frontend-contribution';
+import { MonitorConnection } from './monitor/monitor-connection';
+import { MonitorViewContribution } from './monitor/monitor-view-contribution';
+import { WorkspaceService } from './theia/workspace/workspace-service';
 import { ArduinoToolbar } from './toolbar/arduino-toolbar';
+import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { OutputService } from '../common/protocol/output-service';
+import { ArduinoPreferences } from './arduino-preferences';
+import { SketchesServiceClientImpl } from '../common/protocol/sketches-service-client-impl';
+import { SaveAsSketch } from './contributions/save-as-sketch';
 
 @injectable()
-export class ArduinoFrontendContribution
-  implements
-    FrontendApplicationContribution,
-    TabBarToolbarContribution,
-    CommandContribution,
-    MenuContribution,
-    ColorContribution,
-    StylingParticipant
-{
-  @inject(MessageService)
-  private readonly messageService: MessageService;
+export class ArduinoFrontendContribution implements FrontendApplicationContribution,
+    TabBarToolbarContribution, CommandContribution, MenuContribution, ColorContribution {
 
-  @inject(BoardsServiceProvider)
-  private readonly boardsServiceProvider: BoardsServiceProvider;
+    @inject(ILogger)
+    protected logger: ILogger;
 
-  @inject(CommandRegistry)
-  private readonly commandRegistry: CommandRegistry;
+    @inject(MessageService)
+    protected readonly messageService: MessageService;
 
-  @inject(ElectronWindowPreferences)
-  private readonly electronWindowPreferences: ElectronWindowPreferences;
+    @inject(BoardsService)
+    protected readonly boardsService: BoardsService;
 
-  @inject(FrontendApplicationStateService)
-  private readonly appStateService: FrontendApplicationStateService;
+    @inject(CoreService)
+    protected readonly coreService: CoreService;
 
-  @postConstruct()
-  protected init(): void {
-    if (!window.navigator.onLine) {
-      // tslint:disable-next-line:max-line-length
-      this.messageService.warn(
-        nls.localize(
-          'arduino/common/offlineIndicator',
-          'You appear to be offline. Without an Internet connection, the Arduino CLI might not be able to download the required resources and could cause malfunction. Please connect to the Internet and restart the application.'
-        )
-      );
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClientImpl: BoardsServiceProvider;
+
+    @inject(SelectionService)
+    protected readonly selectionService: SelectionService;
+
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
+
+    @inject(ContextMenuRenderer)
+    protected readonly contextMenuRenderer: ContextMenuRenderer;
+
+    @inject(FileDialogService)
+    protected readonly fileDialogService: FileDialogService;
+
+    @inject(FileService)
+    protected readonly fileSystem: FileService;
+
+    @inject(SketchesService)
+    protected readonly sketchService: SketchesService;
+
+    @inject(BoardsConfigDialog)
+    protected readonly boardsConfigDialog: BoardsConfigDialog;
+
+    @inject(MenuModelRegistry)
+    protected readonly menuRegistry: MenuModelRegistry;
+
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
+
+    @inject(StatusBar)
+    protected readonly statusBar: StatusBar;
+
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
+    @inject(MonitorConnection)
+    protected readonly monitorConnection: MonitorConnection;
+
+    @inject(FileNavigatorContribution)
+    protected readonly fileNavigatorContributions: FileNavigatorContribution;
+
+    @inject(OutputContribution)
+    protected readonly outputContribution: OutputContribution;
+
+    @inject(OutlineViewContribution)
+    protected readonly outlineContribution: OutlineViewContribution;
+
+    @inject(ProblemContribution)
+    protected readonly problemContribution: ProblemContribution;
+
+    @inject(ScmContribution)
+    protected readonly scmContribution: ScmContribution;
+
+    @inject(SearchInWorkspaceFrontendContribution)
+    protected readonly siwContribution: SearchInWorkspaceFrontendContribution;
+
+    @inject(EditorMode)
+    protected readonly editorMode: EditorMode;
+
+    @inject(ArduinoDaemon)
+    protected readonly daemon: ArduinoDaemon;
+
+    @inject(OpenerService)
+    protected readonly openerService: OpenerService;
+
+    @inject(ConfigService)
+    protected readonly configService: ConfigService;
+
+    @inject(BoardsDataStore)
+    protected readonly boardsDataStore: BoardsDataStore;
+
+    @inject(MainMenuManager)
+    protected readonly mainMenuManager: MainMenuManager;
+
+    @inject(FileSystemExt)
+    protected readonly fileSystemExt: FileSystemExt;
+
+    @inject(HostedPluginSupport)
+    protected hostedPluginSupport: HostedPluginSupport;
+
+    @inject(ExecutableService)
+    protected executableService: ExecutableService;
+
+    @inject(OutputService)
+    protected readonly outputService: OutputService;
+
+    @inject(ArduinoPreferences)
+    protected readonly arduinoPreferences: ArduinoPreferences;
+
+    @inject(SketchesServiceClientImpl)
+    protected readonly sketchServiceClient: SketchesServiceClientImpl;
+
+    protected invalidConfigPopup: Promise<void | 'No' | 'Yes' | undefined> | undefined;
+
+    @postConstruct()
+    protected async init(): Promise<void> {
+        if (!window.navigator.onLine) {
+            // tslint:disable-next-line:max-line-length
+            this.messageService.warn('You appear to be offline. Without an Internet connection, the Arduino CLI might not be able to download the required resources and could cause malfunction. Please connect to the Internet and restart the application.');
+        }
+        const updateStatusBar = ({ selectedBoard, selectedPort }: BoardsConfig.Config) => {
+            this.statusBar.setElement('arduino-selected-board', {
+                alignment: StatusBarAlignment.RIGHT,
+                text: selectedBoard ? `$(microchip) ${selectedBoard.name}` : '$(close) no board selected',
+                className: 'arduino-selected-board'
+            });
+            if (selectedBoard) {
+                this.statusBar.setElement('arduino-selected-port', {
+                    alignment: StatusBarAlignment.RIGHT,
+                    text: selectedPort ? `on ${Port.toString(selectedPort)}` : '[not connected]',
+                    className: 'arduino-selected-port'
+                });
+            }
+        }
+        this.boardsServiceClientImpl.onBoardsConfigChanged(updateStatusBar);
+        updateStatusBar(this.boardsServiceClientImpl.boardsConfig);
     }
-  }
 
-  onStart(): void {
-    this.electronWindowPreferences.onPreferenceChanged((event) => {
-      if (event.newValue !== event.oldValue) {
-        switch (event.preferenceName) {
-          case 'window.zoomLevel':
-            if (typeof event.newValue === 'number') {
-              window.electronTheiaCore.setZoomLevel(event.newValue || 0);
+    onStart(app: FrontendApplication): void {
+        // Initialize all `pro-mode` widgets. This is a NOOP if in normal mode.
+        for (const viewContribution of [
+            this.fileNavigatorContributions,
+            this.outputContribution,
+            this.outlineContribution,
+            this.problemContribution,
+            this.scmContribution,
+            this.siwContribution] as Array<FrontendApplicationContribution>) {
+            if (viewContribution.initializeLayout) {
+                viewContribution.initializeLayout(app);
             }
-            break;
         }
-      }
-    });
-    this.appStateService.reachedState('ready').then(() =>
-      this.electronWindowPreferences.ready.then(() => {
-        const zoomLevel =
-          this.electronWindowPreferences.get('window.zoomLevel');
-        window.electronTheiaCore.setZoomLevel(zoomLevel);
-      })
-    );
-  }
-
-  registerToolbarItems(registry: TabBarToolbarRegistry): void {
-    registry.registerItem({
-      id: BoardsToolBarItem.TOOLBAR_ID,
-      render: () => (
-        <BoardsToolBarItem
-          key="boardsToolbarItem"
-          commands={this.commandRegistry}
-          boardsServiceProvider={this.boardsServiceProvider}
-        />
-      ),
-      isVisible: (widget) =>
-        ArduinoToolbar.is(widget) && widget.side === 'left',
-      priority: 7,
-    });
-    registry.registerItem({
-      id: 'toggle-serial-plotter',
-      command: SerialPlotterContribution.Commands.OPEN_TOOLBAR.id,
-      tooltip: nls.localize(
-        'arduino/serial/openSerialPlotter',
-        'Serial Plotter'
-      ),
-    });
-    registry.registerItem({
-      id: 'toggle-serial-monitor',
-      command: MonitorViewContribution.TOGGLE_SERIAL_MONITOR_TOOLBAR,
-      tooltip: nls.localize('arduino/common/serialMonitor', 'Serial Monitor'),
-    });
-  }
-
-  registerCommands(registry: CommandRegistry): void {
-    for (const command of [
-      EditorCommands.SPLIT_EDITOR_DOWN,
-      EditorCommands.SPLIT_EDITOR_LEFT,
-      EditorCommands.SPLIT_EDITOR_RIGHT,
-      EditorCommands.SPLIT_EDITOR_UP,
-      EditorCommands.SPLIT_EDITOR_VERTICAL,
-      EditorCommands.SPLIT_EDITOR_HORIZONTAL,
-      FileNavigatorCommands.REVEAL_IN_NAVIGATOR,
-    ]) {
-      registry.unregisterCommand(command);
+        const start = async ({ selectedBoard }: BoardsConfig.Config) => {
+            if (selectedBoard) {
+                const { name, fqbn } = selectedBoard;
+                if (fqbn) {
+                    await this.hostedPluginSupport.didStart;
+                    this.startLanguageServer(fqbn, name);
+                }
+            }
+        };
+        this.boardsServiceClientImpl.onBoardsConfigChanged(start);
+        this.arduinoPreferences.onPreferenceChanged(event => {
+            if (event.preferenceName === 'arduino.language.log' && event.newValue !== event.oldValue) {
+                start(this.boardsServiceClientImpl.boardsConfig);
+            }
+        });
+        this.arduinoPreferences.ready.then(() => {
+            const webContents = remote.getCurrentWebContents();
+            const zoomLevel = this.arduinoPreferences.get('arduino.window.zoomLevel');
+            webContents.setZoomLevel(zoomLevel);
+        });
+        this.arduinoPreferences.onPreferenceChanged(event => {
+            if (event.preferenceName === 'arduino.window.zoomLevel' && typeof event.newValue === 'number' && event.newValue !== event.oldValue) {
+                const webContents = remote.getCurrentWebContents();
+                webContents.setZoomLevel(event.newValue || 0);
+            }
+        });
     }
-  }
 
-  registerMenus(registry: MenuModelRegistry): void {
-    const menuId = (menuPath: string[]): string => {
-      const index = menuPath.length - 1;
-      const menuId = menuPath[index];
-      return menuId;
-    };
-    registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(MonacoMenus.SELECTION));
-    registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(EditorMainMenu.GO));
-    registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(TerminalMenus.TERMINAL));
-    registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(CommonMenus.VIEW));
-
-    registry.registerSubmenu(
-      ArduinoMenus.SKETCH,
-      nls.localize('arduino/menu/sketch', 'Sketch')
-    );
-    registry.registerSubmenu(
-      ArduinoMenus.TOOLS,
-      nls.localize('arduino/menu/tools', 'Tools')
-    );
-  }
-
-  registerColors(colors: ColorRegistry): void {
-    colors.register(
-      {
-        id: 'arduino.toolbar.button.background',
-        defaults: {
-          dark: 'button.background',
-          light: 'button.background',
-          hcDark: 'activityBar.inactiveForeground',
-          hcLight: 'activityBar.inactiveForeground',
-        },
-        description:
-          'Background color of the toolbar items. Such as Upload, Verify, etc.',
-      },
-      {
-        id: 'arduino.toolbar.button.hoverBackground',
-        defaults: {
-          dark: 'button.hoverBackground',
-          light: 'button.hoverBackground',
-          hcDark: 'button.background',
-          hcLight: 'button.background',
-        },
-        description:
-          'Background color of the toolbar items when hovering over them. Such as Upload, Verify, etc.',
-      },
-      {
-        id: 'arduino.toolbar.button.secondary.label',
-        defaults: {
-          dark: 'secondaryButton.foreground',
-          light: 'button.foreground',
-          hcDark: 'activityBar.inactiveForeground',
-          hcLight: 'activityBar.inactiveForeground',
-        },
-        description:
-          'Foreground color of the toolbar items. Such as Serial Monitor and Serial Plotter',
-      },
-      {
-        id: 'arduino.toolbar.button.secondary.hoverBackground',
-        defaults: {
-          dark: 'secondaryButton.hoverBackground',
-          light: 'button.hoverBackground',
-          hcDark: 'textLink.foreground',
-          hcLight: 'textLink.foreground',
-        },
-        description:
-          'Background color of the toolbar items when hovering over them, such as "Serial Monitor" and "Serial Plotter"',
-      },
-      {
-        id: 'arduino.toolbar.toggleBackground',
-        defaults: {
-          dark: 'editor.selectionBackground',
-          light: 'editor.selectionBackground',
-          hcDark: 'textPreformat.foreground',
-          hcLight: 'textPreformat.foreground',
-        },
-        description:
-          'Toggle color of the toolbar items when they are currently toggled (the command is in progress)',
-      },
-      {
-        id: 'arduino.toolbar.dropdown.border',
-        defaults: {
-          dark: 'dropdown.border',
-          light: 'dropdown.border',
-          hcDark: 'dropdown.border',
-          hcLight: 'dropdown.border',
-        },
-        description: 'Border color of the Board Selector.',
-      },
-      {
-        id: 'arduino.toolbar.dropdown.borderActive',
-        defaults: {
-          dark: 'focusBorder',
-          light: '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',
-          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',
-          hcDark: 'dropdown.foreground',
-          hcLight: 'dropdown.foreground',
-        },
-        description: 'Font color of the Board Selector.',
-      },
-      {
-        id: 'arduino.toolbar.dropdown.iconSelected',
-        defaults: {
-          dark: 'list.activeSelectionIconForeground',
-          light: 'list.activeSelectionIconForeground',
-          hcDark: 'list.activeSelectionIconForeground',
-          hcLight: 'list.activeSelectionIconForeground',
-        },
-        description:
-          'Color of the selected protocol icon in the Board Selector.',
-      },
-      {
-        id: 'arduino.toolbar.dropdown.option.backgroundHover',
-        defaults: {
-          dark: 'list.hoverBackground',
-          light: 'list.hoverBackground',
-          hcDark: 'list.hoverBackground',
-          hcLight: 'list.hoverBackground',
-        },
-        description: 'Background color on hover of the Board Selector options.',
-      },
-      {
-        id: 'arduino.toolbar.dropdown.option.backgroundSelected',
-        defaults: {
-          dark: 'list.activeSelectionBackground',
-          light: 'list.activeSelectionBackground',
-          hcDark: 'list.activeSelectionBackground',
-          hcLight: 'list.activeSelectionBackground',
-        },
-        description:
-          'Background color of the selected board in the Board Selector.',
-      }
-    );
-  }
-
-  registerThemeStyle(theme: ColorTheme, collector: CssStyleCollector): void {
-    const warningForeground = theme.getColor('warningForeground');
-    const warningBackground = theme.getColor('warningBackground');
-    const focusBorder = theme.getColor('focusBorder');
-    const contrastBorder = theme.getColor('contrastBorder');
-    const notificationsBackground = theme.getColor('notifications.background');
-    const buttonBorder = theme.getColor('button.border');
-    const buttonBackground = theme.getColor('button.background') || 'none';
-    const dropdownBackground = theme.getColor('dropdown.background');
-    const arduinoToolbarButtonBackground = theme.getColor(
-      'arduino.toolbar.button.background'
-    );
-    if (isHighContrast(theme.type)) {
-      // toolbar items
-      collector.addRule(`
-        .p-TabBar-toolbar .item.arduino-tool-item.enabled:hover > div.toggle-serial-monitor,
-        .p-TabBar-toolbar .item.arduino-tool-item.enabled:hover > div.toggle-serial-plotter {
-          background: transparent;
-        }
-      `);
-      if (contrastBorder) {
-        collector.addRule(`
-          .quick-input-widget {
-            outline: 1px solid ${contrastBorder};
-            outline-offset: -1px;
-          }
-        `);
-      }
-      if (focusBorder) {
-        // customized react-select widget
-        collector.addRule(`
-          .arduino-select__option--is-selected {
-            outline: 1px solid ${focusBorder};
-          }
-        `);
-        collector.addRule(`
-          .arduino-select__option--is-focused {
-            outline: 1px dashed ${focusBorder};
-          }
-        `);
-        // boards selector dropdown
-        collector.addRule(`
-          #select-board-dialog .selectBoardContainer .list .item:hover {
-            outline: 1px dashed ${focusBorder};
-          }
-        `);
-        // button hover
-        collector.addRule(`
-          .theia-button:hover,
-          button.theia-button:hover {
-            outline: 1px dashed ${focusBorder};
-          }
-        `);
-        collector.addRule(`
-          .theia-button {
-            border: 1px solid ${focusBorder};
-          }
-        `);
-        collector.addRule(`
-          .component-list-item .header .installed-version:hover:before {
-            background-color: transparent;
-            outline: 1px dashed ${focusBorder};
-          }
-        `);
-        // tree node
-        collector.addRule(`
-          .theia-TreeNode:hover {
-            outline: 1px dashed ${focusBorder};
-          }
-        `);
-        collector.addRule(`
-          .quick-input-list .monaco-list-row.focused,
-          .theia-Tree .theia-TreeNode.theia-mod-selected {
-            outline: 1px dotted ${focusBorder};
-          }
-        `);
-        collector.addRule(`
-          div#select-board-dialog .selectBoardContainer .list .item.selected,
-          .theia-Tree:focus .theia-TreeNode.theia-mod-selected,
-          .theia-Tree .ReactVirtualized__List:focus .theia-TreeNode.theia-mod-selected {
-            outline: 1px solid ${focusBorder};
-          }
-        `);
-        // quick input
-        collector.addRule(`
-          .quick-input-list .monaco-list-row:hover {
-            outline: 1px dashed ${focusBorder};
-          }
-        `);
-        // editor tab-bar
-        collector.addRule(`
-          .p-TabBar.theia-app-centers .p-TabBar-tab.p-mod-closable > .p-TabBar-tabCloseIcon:hover {
-            outline: 1px dashed ${focusBorder};
-          }
-        `);
-        collector.addRule(`
-          #theia-main-content-panel .p-TabBar .p-TabBar-tab:hover {
-            outline: 1px dashed ${focusBorder};
-            outline-offset: -4px;
-          }
-        `);
-        collector.addRule(`
-          #theia-main-content-panel .p-TabBar .p-TabBar-tab.p-mod-current {
-            outline: 1px solid ${focusBorder};
-            outline-offset: -4px;
-          }
-        `);
-        // boards selector dropdown
-        collector.addRule(`
-          .arduino-boards-dropdown-item:hover {
-            outline: 1px dashed ${focusBorder};
-            outline-offset: -2px;
-          }
-        `);
-        if (notificationsBackground) {
-          // notification
-          collector.addRule(`
-            .theia-notification-list-item:hover:not(:focus) {
-              background-color: ${notificationsBackground};
-              outline: 1px dashed ${focusBorder};
-              outline-offset: -2px;
+    protected startLanguageServer = debounce((fqbn: string, name: string | undefined) => this.doStartLanguageServer(fqbn, name));
+    protected async doStartLanguageServer(fqbn: string, name: string | undefined): Promise<void> {
+        this.logger.info(`Starting language server: ${fqbn}`);
+        const log = this.arduinoPreferences.get('arduino.language.log');
+        let currentSketchPath: string | undefined = undefined;
+        if (log) {
+            const currentSketch = await this.sketchServiceClient.currentSketch();
+            if (currentSketch) {
+                currentSketchPath = await this.fileSystem.fsPath(new URI(currentSketch.uri));
             }
-          `);
         }
-        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};
+        const { clangdUri, cliUri, lsUri } = await this.executableService.list();
+        const [clangdPath, cliPath, lsPath] = await Promise.all([
+            this.fileSystem.fsPath(new URI(clangdUri)),
+            this.fileSystem.fsPath(new URI(cliUri)),
+            this.fileSystem.fsPath(new URI(lsUri)),
+        ]);
+        this.commandRegistry.executeCommand('arduino.languageserver.start', {
+            lsPath,
+            cliPath,
+            clangdPath,
+            log: currentSketchPath ? currentSketchPath : log,
+            board: {
+                fqbn,
+                name: name ? `"${name}"` : undefined
             }
-          `);
-          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};
-          }
-        `);
-      }
+        });
     }
-  }
+
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+        registry.registerItem({
+            id: BoardsToolBarItem.TOOLBAR_ID,
+            render: () => <BoardsToolBarItem
+                key='boardsToolbarItem'
+                commands={this.commandRegistry}
+                boardsServiceClient={this.boardsServiceClientImpl} />,
+            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
+            priority: 7
+        });
+        registry.registerItem({
+            id: 'toggle-serial-monitor',
+            command: MonitorViewContribution.TOGGLE_SERIAL_MONITOR_TOOLBAR,
+            tooltip: 'Serial Monitor'
+        });
+    }
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(ArduinoCommands.TOGGLE_COMPILE_FOR_DEBUG, {
+            execute: () => this.editorMode.toggleCompileForDebug(),
+            isToggled: () => this.editorMode.compileForDebug
+        });
+        registry.registerCommand(ArduinoCommands.OPEN_SKETCH_FILES, {
+            execute: async (uri: URI) => {
+                this.openSketchFiles(uri);
+            }
+        });
+        registry.registerCommand(ArduinoCommands.OPEN_BOARDS_DIALOG, {
+            execute: async (query?: string | undefined) => {
+                const boardsConfig = await this.boardsConfigDialog.open(query);
+                if (boardsConfig) {
+                    this.boardsServiceClientImpl.boardsConfig = boardsConfig;
+                }
+            }
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry) {
+        const menuId = (menuPath: string[]): string => {
+            const index = menuPath.length - 1;
+            const menuId = menuPath[index];
+            return menuId;
+        }
+        registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(MonacoMenus.SELECTION));
+        registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(EditorMainMenu.GO));
+        registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(TerminalMenus.TERMINAL));
+        registry.getMenu(MAIN_MENU_BAR).removeNode(menuId(CommonMenus.VIEW));
+
+        registry.registerSubmenu(ArduinoMenus.SKETCH, 'Sketch');
+        registry.registerSubmenu(ArduinoMenus.TOOLS, 'Tools');
+        registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
+            commandId: ArduinoCommands.TOGGLE_COMPILE_FOR_DEBUG.id,
+            label: 'Optimize for Debugging',
+            order: '4'
+        });
+    }
+
+    protected async openSketchFiles(uri: URI): Promise<void> {
+        try {
+            const sketch = await this.sketchService.loadSketch(uri.toString());
+            const { mainFileUri, rootFolderFileUris } = sketch;
+            for (const uri of [mainFileUri, ...rootFolderFileUris]) {
+                await this.ensureOpened(uri);
+            }
+            await this.ensureOpened(mainFileUri, true);
+            if (mainFileUri.endsWith('.pde')) {
+                const message = `The '${sketch.name}' still uses the old \`.pde\` format. Do you want to switch to the new \`.ino\` extension?`;
+                this.messageService.info(message, 'Later', 'Yes').then(async answer => {
+                    if (answer === 'Yes') {
+                        this.commandRegistry.executeCommand(SaveAsSketch.Commands.SAVE_AS_SKETCH.id, { execOnlyIfTemp: false, openAfterMove: true, wipeOriginal: false });
+                    }
+                });
+            }
+        } catch (e) {
+            console.error(e);
+            const message = e instanceof Error ? e.message : JSON.stringify(e);
+            this.messageService.error(message);
+        }
+    }
+
+    protected async ensureOpened(uri: string, forceOpen: boolean = false): Promise<any> {
+        const widget = this.editorManager.all.find(widget => widget.editor.uri.toString() === uri);
+        if (!widget || forceOpen) {
+            return this.editorManager.open(new URI(uri));
+        }
+    }
+
+    registerColors(colors: ColorRegistry): void {
+        colors.register(
+            {
+                id: 'arduino.branding.primary',
+                defaults: {
+                    dark: 'statusBar.background',
+                    light: 'statusBar.background'
+                },
+                description: 'The primary branding color, such as dialog titles, library, and board manager list labels.'
+            },
+            {
+                id: 'arduino.branding.secondary',
+                defaults: {
+                    dark: 'statusBar.background',
+                    light: 'statusBar.background'
+                },
+                description: 'Secondary branding color for list selections, dropdowns, and widget borders.'
+            },
+            {
+                id: 'arduino.foreground',
+                defaults: {
+                    dark: 'editorWidget.background',
+                    light: 'editorWidget.background',
+                    hc: 'editorWidget.background'
+                },
+                description: 'Color of the Arduino IDE foreground which is used for dialogs, such as the Select Board dialog.'
+            },
+            {
+                id: 'arduino.toolbar.background',
+                defaults: {
+                    dark: 'button.background',
+                    light: 'button.background',
+                    hc: 'activityBar.inactiveForeground'
+                },
+                description: 'Background color of the toolbar items. Such as Upload, Verify, etc.'
+            },
+            {
+                id: 'arduino.toolbar.hoverBackground',
+                defaults: {
+                    dark: 'button.hoverBackground',
+                    light: 'button.hoverBackground',
+                    hc: 'activityBar.inactiveForeground'
+                },
+                description: 'Background color of the toolbar items when hovering over them. Such as Upload, Verify, etc.'
+            },
+            {
+                id: 'arduino.output.foreground',
+                defaults: {
+                    dark: 'editor.foreground',
+                    light: 'editor.foreground',
+                    hc: 'editor.foreground'
+                },
+                description: 'Color of the text in the Output view.'
+            },
+            {
+                id: 'arduino.output.background',
+                defaults: {
+                    dark: 'editor.background',
+                    light: 'editor.background',
+                    hc: 'editor.background'
+                },
+                description: 'Background color of the Output view.'
+            }
+        );
+    }
+
 }

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

@@ -1,367 +1,73 @@
+import { interfaces } from 'inversify';
 import {
-  PreferenceContribution,
-  PreferenceProxy,
-  PreferenceSchema,
-  PreferenceService,
-  createPreferenceProxy,
+    createPreferenceProxy,
+    PreferenceProxy,
+    PreferenceService,
+    PreferenceContribution,
+    PreferenceSchema
 } from '@theia/core/lib/browser/preferences';
-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 {
-  Stable = 'stable',
-  Nightly = 'nightly',
-}
-export const ErrorRevealStrategyLiterals = [
-  /**
-   * Scroll vertically as necessary and reveal a line.
-   */
-  'auto',
-  /**
-   * Scroll vertically as necessary and reveal a line centered vertically.
-   */
-  'center',
-  /**
-   * Scroll vertically as necessary and reveal a line close to the top of the viewport, optimized for viewing a code definition.
-   */
-  'top',
-  /**
-   * Scroll vertically as necessary and reveal a line centered vertically only if it lies outside the viewport.
-   */
-  'centerIfOutsideViewport',
-] as const;
-export type ErrorRevealStrategy = (typeof ErrorRevealStrategyLiterals)[number];
-export namespace ErrorRevealStrategy {
-  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
-  export function is(arg: any): arg is ErrorRevealStrategy {
-    return !!arg && ErrorRevealStrategyLiterals.includes(arg);
-  }
-  export const Default: ErrorRevealStrategy = 'centerIfOutsideViewport';
-}
-
-export 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,
+    'type': 'object',
+    'properties': {
+        'arduino.language.log': {
+            'type': 'boolean',
+            'description': "True if the Arduino Language Server should generate log files into the sketch folder. Otherwise, false. It's false by default.",
+            'default': false
+        },
+        'arduino.compile.verbose': {
+            'type': 'boolean',
+            'description': 'True for verbose compile output. False by default',
+            'default': false
+        },
+        'arduino.upload.verbose': {
+            'type': 'boolean',
+            'description': 'True for verbose upload output. False by default.',
+            'default': false
+        },
+        'arduino.upload.verify': {
+            'type': 'boolean',
+            'default': false
+        },
+        'arduino.window.autoScale': {
+            'type': 'boolean',
+            'description': 'True if the user interface automatically scales with the font size.',
+            'default': true
+        },
+        'arduino.window.zoomLevel': {
+            'type': 'number',
+            'description': 'Adjust the zoom level of the window. The original size is 0 and each increment above (e.g. 1) or below (e.g. -1) represents zooming 20% larger or smaller. You can also enter decimals to adjust the zoom level with a finer granularity.',
+            'default': 0
+        },
+        'arduino.ide.autoUpdate': {
+            'type': 'boolean',
+            'description': 'True to enable automatic update checks. The IDE will check for updates automatically and periodically.',
+            'default': true
+        }
+    }
 };
 
 export interface ArduinoConfiguration {
-  'arduino.language.log': boolean;
-  'arduino.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.ide.updateChannel': UpdateChannel;
-  'arduino.ide.updateBaseUrl': string;
-  'arduino.board.certificates': string;
-  'arduino.sketchbook.showAllFiles': boolean;
-  'arduino.cloud.enabled': boolean;
-  'arduino.cloud.pull.warn': boolean;
-  'arduino.cloud.push.warn': boolean;
-  'arduino.cloud.pushpublic.warn': boolean;
-  'arduino.cloud.sketchSyncEndpoint': string;
-  'arduino.cloud.sharedSpaceID': string;
-  'arduino.auth.clientID': string;
-  'arduino.auth.domain': string;
-  'arduino.auth.audience': string;
-  'arduino.auth.registerUri': string;
-  'arduino.cli.daemon.debug': boolean;
-  'arduino.sketch.inoBlueprint': string;
-  'arduino.checkForUpdates': boolean;
-  'arduino.monitor.dockPanel': MonitorWidgetDockPanel;
+    'arduino.language.log': boolean;
+    'arduino.compile.verbose': boolean;
+    'arduino.upload.verbose': boolean;
+    'arduino.upload.verify': boolean;
+    'arduino.window.autoScale': boolean;
+    'arduino.window.zoomLevel': number;
+    'arduino.ide.autoUpdate': boolean;
 }
 
 export const ArduinoPreferences = Symbol('ArduinoPreferences');
 export type ArduinoPreferences = PreferenceProxy<ArduinoConfiguration>;
 
-export function bindArduinoPreferences(bind: interfaces.Bind): void {
-  bind(ArduinoPreferences).toDynamicValue((ctx) => {
-    const preferences = ctx.container.get<PreferenceService>(PreferenceService);
+export function createArduinoPreferences(preferences: PreferenceService): ArduinoPreferences {
     return createPreferenceProxy(preferences, ArduinoConfigSchema);
-  });
-  bind(PreferenceContribution).toConstantValue({
-    schema: ArduinoConfigSchema,
-  });
+}
+
+export function bindArduinoPreferences(bind: interfaces.Bind): void {
+    bind(ArduinoPreferences).toDynamicValue(ctx => {
+        const preferences = ctx.container.get<PreferenceService>(PreferenceService);
+        return createArduinoPreferences(preferences);
+    });
+    bind(PreferenceContribution).toConstantValue({ schema: ArduinoConfigSchema });
 }

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

@@ -0,0 +1,68 @@
+import { toUnix } from 'upath';
+import URI from '@theia/core/lib/common/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 = hash.slice(1); // Trim the leading `#`.
+            return new URI(toUnix(path.slice(isWindows && hash.startsWith('/') ? 1 : 0))).withScheme('file').toString();
+        }
+        return undefined;
+    }
+
+}

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

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

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

@@ -1,22 +0,0 @@
-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(
-    {
-      id: 'arduino-cloud--login',
-      label: 'Sign in',
-    },
-    'arduino/cloud/signIn'
-  );
-
-  export const LOGOUT = Command.toLocalizedCommand(
-    {
-      id: 'arduino-cloud--logout',
-      label: 'Sign Out',
-    },
-    'arduino/cloud/signOut'
-  );
-}

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

@@ -1,229 +1,62 @@
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application-contribution';
-import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { injectable, inject } from 'inversify';
 import { MessageService } from '@theia/core/lib/common/message-service';
-import { MessageType } from '@theia/core/lib/common/message-service-protocol';
-import { nls } from '@theia/core/lib/common/nls';
-import { notEmpty } from '@theia/core/lib/common/objects';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { NotificationManager } from '@theia/messages/lib/browser/notifications-manager';
-import { InstallManually } from '../../common/nls';
-import { Installable, ResponseServiceClient } from '../../common/protocol';
-import {
-  BoardIdentifier,
-  BoardsPackage,
-  BoardsService,
-  createPlatformIdentifier,
-  isBoardIdentifierChangeEvent,
-  PlatformIdentifier,
-  platformIdentifierEquals,
-  serializePlatformIdentifier,
-} from '../../common/protocol/boards-service';
-import { NotificationCenter } from '../notification-center';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
+import { BoardsService, BoardsPackage } from '../../common/protocol/boards-service';
 import { BoardsServiceProvider } from './boards-service-provider';
 import { BoardsListWidgetFrontendContribution } from './boards-widget-frontend-contribution';
+import { InstallationProgressDialog } from '../widgets/progress-dialog';
+import { BoardsConfig } from './boards-config';
 
 /**
- * Listens on `BoardsConfigChangeEvent`s, if a board is selected which does not
+ * Listens on `BoardsConfig.Config` changes, if a board is selected which does not
  * have the corresponding core installed, it proposes the user to install the core.
  */
 @injectable()
 export class BoardsAutoInstaller implements FrontendApplicationContribution {
-  @inject(NotificationCenter)
-  private readonly notificationCenter: NotificationCenter;
-  @inject(MessageService)
-  private readonly messageService: MessageService;
-  @inject(NotificationManager)
-  private readonly notificationManager: NotificationManager;
-  @inject(BoardsService)
-  private readonly boardsService: BoardsService;
-  @inject(BoardsServiceProvider)
-  private readonly boardsServiceProvider: BoardsServiceProvider;
-  @inject(ResponseServiceClient)
-  private readonly responseService: ResponseServiceClient;
-  @inject(BoardsListWidgetFrontendContribution)
-  private readonly boardsManagerWidgetContribution: BoardsListWidgetFrontendContribution;
 
-  // Workaround for https://github.com/eclipse-theia/theia/issues/9349
-  private readonly installNotificationInfos: Readonly<{
-    boardName: string;
-    platformId: string;
-    notificationId: string;
-  }>[] = [];
-  private readonly toDispose = new DisposableCollection();
+    @inject(MessageService)
+    protected readonly messageService: MessageService;
 
-  onStart(): void {
-    this.toDispose.pushAll([
-      this.boardsServiceProvider.onBoardsConfigDidChange((event) => {
-        if (isBoardIdentifierChangeEvent(event)) {
-          this.ensureCoreExists(event.selectedBoard);
-        }
-      }),
-      this.notificationCenter.onPlatformDidInstall((event) =>
-        this.clearAllNotificationForPlatform(event.item.id)
-      ),
-    ]);
-    this.boardsServiceProvider.ready.then(() => {
-      const { selectedBoard } = this.boardsServiceProvider.boardsConfig;
-      this.ensureCoreExists(selectedBoard);
-    });
-  }
+    @inject(BoardsService)
+    protected readonly boardsService: BoardsService;
 
-  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;
-  }
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClient: BoardsServiceProvider;
 
-  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;
-  }
+    @inject(BoardsListWidgetFrontendContribution)
+    protected readonly boardsManagerFrontendContribution: BoardsListWidgetFrontendContribution;
 
-  private async ensureCoreExists(
-    selectedBoard: BoardIdentifier | undefined
-  ): Promise<void> {
-    if (!selectedBoard) {
-      return;
+    onStart(): void {
+        this.boardsServiceClient.onBoardsConfigChanged(this.ensureCoreExists.bind(this));
+        this.ensureCoreExists(this.boardsServiceClient.boardsConfig);
     }
-    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);
 
-    const version = candidate.availableVersions[0]
-      ? `[v ${candidate.availableVersions[0]}]`
-      : '';
-    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 notificationId = this.notificationId(message, InstallManually, yes);
-    this.installNotificationInfos.push({
-      boardName: selectedBoardName,
-      platformId: platformIdToInstall,
-      notificationId,
-    });
-    const answer = await this.messageService.info(
-      message,
-      InstallManually,
-      yes
-    );
-    if (answer) {
-      const index = this.installNotificationInfos.findIndex(
-        ({ boardName, platformId }) =>
-          platformIdToInstall === platformId && selectedBoardName === boardName
-      );
-      if (index !== -1) {
-        this.installNotificationInfos.splice(index, 1);
-      }
-      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',
+    protected ensureCoreExists(config: BoardsConfig.Config): void {
+        const { selectedBoard } = config;
+        if (selectedBoard) {
+            this.boardsService.search({}).then(packages => {
+                const candidates = packages
+                    .filter(pkg => BoardsPackage.contains(selectedBoard, pkg))
+                    .filter(({ installable, installedVersion }) => installable && !installedVersion);
+                for (const candidate of candidates) {
+                    // tslint:disable-next-line:max-line-length
+                    this.messageService.info(`The \`"${candidate.name}"\` core has to be installed for the currently selected \`"${selectedBoard.name}"\` board. Do you want to install it now?`, 'Install Manually', 'Yes').then(async answer => {
+                        if (answer === 'Yes') {
+                            const dialog = new InstallationProgressDialog(candidate.name, candidate.availableVersions[0]);
+                            dialog.open();
+                            try {
+                                await this.boardsService.install({ item: candidate });
+                            } finally {
+                                dialog.close();
+                            }
+                        }
+                        if (answer) {
+                            this.boardsManagerFrontendContribution.openView({ reveal: true }).then(widget => widget.refresh(candidate.name.toLocaleLowerCase()));
+                        }
+                    });
+                }
             })
-          );
-      }
+        }
     }
-  }
 
-  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

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

@@ -0,0 +1,68 @@
+import * as React from 'react';
+import { injectable, inject } from '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} />
+        </div>;
+    }
+
+    protected 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

@@ -0,0 +1,123 @@
+import { injectable, inject, postConstruct } from 'inversify';
+import { Message } from '@phosphor/messaging';
+import { AbstractDialog, DialogProps, Widget, DialogError } from '@theia/core/lib/browser';
+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';
+
+@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 readonly props: BoardsConfigDialogProps) {
+        super(props);
+
+        this.contentNode.classList.add('select-board-dialog');
+        this.contentNode.appendChild(this.createDescription());
+
+        this.appendCloseButton('CANCEL');
+        this.appendAcceptButton('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.
+     */
+    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 = 'Select Other Board & Port';
+        title.classList.add('title');
+        head.appendChild(title);
+
+        const text = document.createElement('div');
+        text.classList.add('text');
+        head.appendChild(text);
+
+        for (const paragraph of [
+            'Select both a Board and a Port if you want to upload a sketch.',
+            'If you only select a Board you will be able just to compile, but not to upload your sketch.'
+        ]) {
+            const p = document.createElement('p');
+            p.textContent = paragraph;
+            text.appendChild(p);
+        }
+
+        return head;
+    }
+
+    protected onAfterAttach(msg: Message): void {
+        if (this.widget.isAttached) {
+            Widget.detach(this.widget);
+        }
+        Widget.attach(this.widget, this.contentNode);
+        this.toDisposeOnDetach.push(this.widget.onBoardConfigChanged(config => {
+            this.config = config;
+            this.update();
+        }));
+        super.onAfterAttach(msg);
+        this.update();
+    }
+
+    protected onUpdateRequest(msg: Message) {
+        super.onUpdateRequest(msg);
+        this.widget.update();
+    }
+
+    protected onActivateRequest(msg: Message): void {
+        super.onActivateRequest(msg);
+        this.widget.activate();
+    }
+
+    protected handleEnter(event: KeyboardEvent): boolean | void {
+        if (event.target instanceof HTMLTextAreaElement) {
+            return false;
+        }
+    }
+
+    protected isValid(value: BoardsConfig.Config): DialogError {
+        if (!value.selectedBoard) {
+            if (value.selectedPort) {
+                return 'Please pick a board connected to the port you have selected.';
+            }
+            return false;
+        }
+        return '';
+    }
+
+    get value(): BoardsConfig.Config {
+        return this.config;
+    }
+
+}

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

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

@@ -0,0 +1,286 @@
+import * as React from '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 { BoardsServiceProvider } from './boards-service-provider';
+
+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>;
+    }
+
+    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
+}> {
+
+    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
+        }
+    }
+
+    componentDidMount() {
+        this.updateBoards();
+        this.updatePorts(this.props.boardsServiceProvider.availableBoards.map(({ port }) => port).filter(notEmpty));
+        this.toDispose.pushAll([
+            this.props.notificationCenter.onAttachedBoardsChanged(event => this.updatePorts(event.newState.ports, AttachedBoardsChangeEvent.diff(event).detached.ports)),
+            this.props.boardsServiceProvider.onBoardsConfigChanged(({ selectedBoard, selectedPort }) => {
+                this.setState({ selectedBoard, selectedPort }, () => this.fireConfigChanged());
+            }),
+            this.props.notificationCenter.onPlatformInstalled(() => this.updateBoards(this.state.query)),
+            this.props.notificationCenter.onPlatformUninstalled(() => this.updateBoards(this.state.query)),
+            this.props.notificationCenter.onIndexUpdated(() => this.updateBoards(this.state.query)),
+            this.props.notificationCenter.onDaemonStarted(() => this.updateBoards(this.state.query)),
+            this.props.notificationCenter.onDaemonStopped(() => this.setState({ searchResults: [] })),
+            this.props.onFilteredTextDidChangeEvent(query => this.setState({ query }, () => this.updateBoards(this.state.query)))
+        ]);
+    }
+
+    componentWillUnmount(): void {
+        this.toDispose.dispose();
+    }
+
+    protected fireConfigChanged() {
+        const { selectedBoard, selectedPort } = this.state;
+        this.props.onConfigChange({ selectedBoard, selectedPort });
+    }
+
+    protected updateBoards = (eventOrQuery: React.ChangeEvent<HTMLInputElement> | string = '') => {
+        const query = typeof eventOrQuery === 'string'
+            ? eventOrQuery
+            : eventOrQuery.target.value.toLowerCase();
+        this.setState({ query });
+        this.queryBoards({ query }).then(searchResults => this.setState({ searchResults }));
+    }
+
+    protected updatePorts = (ports: Port[] = [], removedPorts: Port[] = []) => {
+        this.queryPorts(Promise.resolve(ports)).then(({ knownPorts }) => {
+            let { selectedPort } = this.state;
+            // If the currently selected port is not available anymore, unset the selected port.
+            if (removedPorts.some(port => Port.equals(port, selectedPort))) {
+                selectedPort = undefined;
+            }
+            this.setState({ knownPorts, selectedPort }, () => this.fireConfigChanged());
+        });
+    }
+
+    protected queryBoards = (options: { query?: string } = {}): Promise<Array<BoardWithPackage>> => {
+        return this.props.boardsServiceProvider.searchBoards(options);
+    }
+
+    protected get availablePorts(): MaybePromise<Port[]> {
+        return this.props.boardsServiceProvider.availableBoards.map(({ port }) => port).filter(notEmpty);
+    }
+
+    protected queryPorts = async (availablePorts: MaybePromise<Port[]> = this.availablePorts) => {
+        const ports = await availablePorts;
+        return { knownPorts: ports.sort(Port.compare) };
+    }
+
+    protected toggleFilterPorts = () => {
+        this.setState({ showAllPorts: !this.state.showAllPorts });
+    }
+
+    protected selectPort = (selectedPort: Port | undefined) => {
+        this.setState({ selectedPort }, () => this.fireConfigChanged());
+    }
+
+    protected selectBoard = (selectedBoard: BoardWithPackage | undefined) => {
+        this.setState({ selectedBoard }, () => this.fireConfigChanged());
+    }
+
+    protected focusNodeSet = (element: HTMLElement | null) => {
+        this.props.onFocusNodeSet(element || undefined);
+    }
+
+    render(): React.ReactNode {
+        return <div className='body'>
+            {this.renderContainer('boards', this.renderBoards.bind(this))}
+            {this.renderContainer('ports', this.renderPorts.bind(this), this.renderPortsFooter.bind(this))}
+        </div>;
+    }
+
+    protected renderContainer(title: string, contentRenderer: () => React.ReactNode, footerRenderer?: () => React.ReactNode): React.ReactNode {
+        return <div className='container'>
+            <div className='content'>
+                <div className='title'>
+                    {title}
+                </div>
+                {contentRenderer()}
+                <div className='footer'>
+                    {(footerRenderer ? footerRenderer() : '')}
+                </div>
+            </div>
+        </div>;
+    }
+
+    protected renderBoards(): React.ReactNode {
+        const { selectedBoard, searchResults, 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={`${board.name}-${board.packageName}`}
+                    item={board}
+                    label={board.name}
+                    details={board.details}
+                    selected={board.selected}
+                    onClick={this.selectBoard}
+                    missing={board.missing}
+                />)}
+            </div>
+        </React.Fragment>;
+    }
+
+    protected renderPorts(): React.ReactNode {
+        const filter = this.state.showAllPorts ? () => true : Port.isBoardPort;
+        const ports = this.state.knownPorts.filter(filter);
+        return !ports.length ?
+            (
+                <div className='loading noselect'>
+                    No ports discovered
+                </div>
+            ) :
+            (
+                <div className='ports list'>
+                    {ports.map(port => <Item<Port>
+                        key={Port.toString(port)}
+                        item={port}
+                        label={Port.toString(port)}
+                        selected={Port.equals(this.state.selectedPort, port)}
+                        onClick={this.selectPort}
+                    />)}
+                </div>
+            );
+    }
+
+    protected renderPortsFooter(): React.ReactNode {
+        return <div className='noselect'>
+            <label
+                title='Shows all available ports when enabled'>
+                <input
+                    type='checkbox'
+                    defaultChecked={this.state.showAllPorts}
+                    onChange={this.toggleFilterPorts}
+                />
+                <span>Show all ports</span>
+            </label>
+        </div>;
+    }
+
+}
+
+export namespace BoardsConfig {
+
+    export namespace Config {
+
+        export function sameAs(config: Config, other: Config | Board): boolean {
+            const { selectedBoard, selectedPort } = config;
+            if (Board.is(other)) {
+                return !!selectedBoard
+                    && Board.equals(other, selectedBoard)
+                    && Port.sameAs(selectedPort, other.port);
+            }
+            return sameAs(config, other);
+        }
+
+        export function equals(left: Config, right: Config): boolean {
+            return left.selectedBoard === right.selectedBoard
+                && left.selectedPort === right.selectedPort;
+        }
+
+        export function toString(config: Config, options: { default: string } = { default: '' }): string {
+            const { selectedBoard, selectedPort: port } = config;
+            if (!selectedBoard) {
+                return options.default;
+            }
+            const { name } = selectedBoard;
+            return `${name}${port ? ' at ' + Port.toString(port) : ''}`;
+        }
+
+    }
+
+}

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

@@ -0,0 +1,101 @@
+import * as PQueue from 'p-queue';
+import { inject, injectable } from 'inversify';
+import { CommandRegistry } from '@theia/core/lib/common/command';
+import { MenuModelRegistry } from '@theia/core/lib/common/menu';
+import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
+import { BoardsServiceProvider } from './boards-service-provider';
+import { Board, ConfigOption, Programmer } from '../../common/protocol';
+import { FrontendApplicationContribution } from '@theia/core/lib/browser';
+import { BoardsDataStore } from './boards-data-store';
+import { MainMenuManager } from '../../common/main-menu-manager';
+import { ArduinoMenus, unregisterSubmenu } from '../menu/arduino-menus';
+
+@injectable()
+export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
+
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
+
+    @inject(MenuModelRegistry)
+    protected readonly menuRegistry: MenuModelRegistry;
+
+    @inject(MainMenuManager)
+    protected readonly mainMenuManager: MainMenuManager;
+
+    @inject(BoardsDataStore)
+    protected readonly boardsDataStore: BoardsDataStore;
+
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClient: BoardsServiceProvider;
+
+    protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
+    protected readonly toDisposeOnBoardChange = new DisposableCollection();
+
+    async onStart(): Promise<void> {
+        this.updateMenuActions(this.boardsServiceClient.boardsConfig.selectedBoard);
+        this.boardsDataStore.onChanged(() => this.updateMenuActions(this.boardsServiceClient.boardsConfig.selectedBoard));
+        this.boardsServiceClient.onBoardsConfigChanged(({ selectedBoard }) => this.updateMenuActions(selectedBoard));
+    }
+
+    protected async updateMenuActions(selectedBoard: Board | undefined): Promise<void> {
+        return this.queue.add(async () => {
+            this.toDisposeOnBoardChange.dispose();
+            this.mainMenuManager.update();
+            if (selectedBoard) {
+                const { fqbn } = selectedBoard;
+                if (fqbn) {
+                    const { configOptions, programmers, selectedProgrammer } = await this.boardsDataStore.getData(fqbn);
+                    if (configOptions.length) {
+                        const boardsConfigMenuPath = [...ArduinoMenus.TOOLS__BOARD_SETTINGS_GROUP, 'z01_boardsConfig']; // `z_` is for ordering.
+                        for (const { label, option, values } of configOptions.sort(ConfigOption.LABEL_COMPARATOR)) {
+                            const menuPath = [...boardsConfigMenuPath, `${option}`];
+                            const commands = new Map<string, Disposable & { label: string }>()
+                            for (const value of values) {
+                                const id = `${fqbn}-${option}--${value.value}`;
+                                const command = { id };
+                                const selectedValue = value.value;
+                                const handler = {
+                                    execute: () => this.boardsDataStore.selectConfigOption({ fqbn, option, selectedValue }),
+                                    isToggled: () => value.selected
+                                };
+                                commands.set(id, Object.assign(this.commandRegistry.registerCommand(command, handler), { label: value.label }));
+                            }
+                            this.menuRegistry.registerSubmenu(menuPath, label);
+                            this.toDisposeOnBoardChange.pushAll([
+                                ...commands.values(),
+                                Disposable.create(() => unregisterSubmenu(menuPath, this.menuRegistry)),
+                                ...Array.from(commands.keys()).map((commandId, i) => {
+                                    const { label } = commands.get(commandId)!;
+                                    this.menuRegistry.registerMenuAction(menuPath, { commandId, order: `${i}`, label });
+                                    return Disposable.create(() => this.menuRegistry.unregisterMenuAction(commandId));
+                                })
+                            ]);
+                        }
+                    }
+                    if (programmers.length) {
+                        const programmersMenuPath = [...ArduinoMenus.TOOLS__BOARD_SETTINGS_GROUP, 'z02_programmers'];
+                        const label = selectedProgrammer ? `Programmer: "${selectedProgrammer.name}"` : 'Programmer'
+                        this.menuRegistry.registerSubmenu(programmersMenuPath, label);
+                        this.toDisposeOnBoardChange.push(Disposable.create(() => unregisterSubmenu(programmersMenuPath, this.menuRegistry)));
+                        for (const programmer of programmers) {
+                            const { id, name } = programmer;
+                            const command = { id: `${fqbn}-programmer--${id}` };
+                            const handler = {
+                                execute: () => this.boardsDataStore.selectProgrammer({ fqbn, selectedProgrammer: programmer }),
+                                isToggled: () => Programmer.equals(programmer, selectedProgrammer)
+                            };
+                            this.menuRegistry.registerMenuAction(programmersMenuPath, { commandId: command.id, label: name });
+                            this.commandRegistry.registerCommand(command, handler);
+                            this.toDisposeOnBoardChange.pushAll([
+                                Disposable.create(() => this.commandRegistry.unregisterCommand(command)),
+                                Disposable.create(() => this.menuRegistry.unregisterMenuAction(command.id))
+                            ]);
+                        }
+                    }
+                    this.mainMenuManager.update();
+                }
+            }
+        });
+    }
+
+}

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

@@ -1,437 +1,211 @@
-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 { injectable, inject, named } from 'inversify';
 import { ILogger } from '@theia/core/lib/common/logger';
-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,
-  ConfigValue,
-  Programmer,
-  isBoardIdentifierChangeEvent,
-  isProgrammer,
-  sanitizeFqbn,
-} from '../../common/protocol';
+import { deepClone } from '@theia/core/lib/common/objects';
+import { MaybePromise } from '@theia/core/lib/common/types';
+import { Event, Emitter } from '@theia/core/lib/common/event';
+import { FrontendApplicationContribution, LocalStorageService } from '@theia/core/lib/browser';
 import { notEmpty } from '../../common/utils';
-import type {
-  StartupTask,
-  StartupTaskProvider,
-} from '../../electron-common/startup-task';
+import { BoardsService, ConfigOption, Installable, BoardDetails, Programmer } from '../../common/protocol';
 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,
-    StartupTaskProvider,
-    CommandContribution
-{
-  @inject(ILogger)
-  @named('store')
-  private readonly logger: ILogger;
-  @inject(BoardsService)
-  private readonly boardsService: BoardsService;
-  @inject(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;
+export class BoardsDataStore implements FrontendApplicationContribution {
 
-  private readonly onDidChangeEmitter =
-    new Emitter<BoardsDataStoreChangeEvent>();
-  private readonly toDispose = new DisposableCollection(
-    this.onDidChangeEmitter
-  );
-  private _selectedBoardData: BoardsDataStoreChange | undefined;
+    @inject(ILogger)
+    @named('store')
+    protected readonly logger: ILogger;
 
-  onStart(): void {
-    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'
-          );
+    @inject(BoardsService)
+    protected readonly boardsService: BoardsService;
+
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
+
+    @inject(LocalStorageService)
+    protected readonly storageService: LocalStorageService;
+
+    protected readonly onChangedEmitter = new Emitter<void>();
+
+    onStart(): void {
+        this.notificationCenter.onPlatformInstalled(async ({ item }) => {
+            const { installedVersion: version } = item;
+            if (!version) {
+                return;
+            }
+            let shouldFireChanged = false;
+            for (const fqbn of item.boards.map(({ fqbn }) => fqbn).filter(notEmpty).filter(fqbn => !!fqbn)) {
+                const key = this.getStorageKey(fqbn, version);
+                let data = await this.storageService.getData<ConfigOption[] | undefined>(key);
+                if (!data || !data.length) {
+                    const details = await this.getBoardDetailsSafe(fqbn);
+                    if (details) {
+                        data = details.configOptions;
+                        if (data.length) {
+                            await this.storageService.setData(key, data);
+                            shouldFireChanged = true;
+                        }
+                    }
+                }
+            }
+            if (shouldFireChanged) {
+                this.fireChanged();
+            }
+        });
+    }
+
+    get onChanged(): Event<void> {
+        return this.onChangedEmitter.event;
+    }
+
+    async appendConfigToFqbn(
+        fqbn: string | undefined,
+        boardsPackageVersion: MaybePromise<Installable.Version | undefined> = this.getBoardsPackageVersion(fqbn)): Promise<string | undefined> {
+
+        if (!fqbn) {
+            return undefined;
         }
-      }),
-      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) {
-            const data = createDataStoreEntry(details);
-            await this.storageService.setData(key, data);
-            changes.push({ fqbn, data });
-          }
+
+        const { configOptions } = await this.getData(fqbn, boardsPackageVersion);
+        return ConfigOption.decorate(fqbn, configOptions);
+    }
+
+    async getData(
+        fqbn: string | undefined,
+        boardsPackageVersion: MaybePromise<Installable.Version | undefined> = this.getBoardsPackageVersion(fqbn)): Promise<BoardsDataStore.Data> {
+
+        if (!fqbn) {
+            return BoardsDataStore.Data.EMPTY;
         }
-        if (changes.length) {
-          this.fireChanged(...changes);
+
+        const version = await boardsPackageVersion;
+        if (!version) {
+            return BoardsDataStore.Data.EMPTY;
         }
-      }),
-      this.onDidChange((event) => {
-        const selectedFqbn =
-          this.boardsServiceProvider.boardsConfig.selectedBoard?.fqbn;
-        if (event.changes.find((change) => change.fqbn === selectedFqbn)) {
-          this.updateSelectedBoardData(selectedFqbn);
+        const key = this.getStorageKey(fqbn, version);
+        let data = await this.storageService.getData<BoardsDataStore.Data | undefined>(key, undefined);
+        if (BoardsDataStore.Data.is(data)) {
+            return data;
         }
-      }),
-    ]);
 
-    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;
-      }
-      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);
+        const boardDetails = await this.getBoardDetailsSafe(fqbn);
+        if (!boardDetails) {
+            return BoardsDataStore.Data.EMPTY;
         }
-      },
-    });
-  }
 
-  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
-  ): Promise<string | undefined> {
-    if (!fqbn) {
-      return undefined;
-    }
-    const { configOptions } = await this.getData(fqbn);
-    return new FQBN(fqbn).withConfigOptions(...configOptions).toString();
-  }
-
-  async getData(fqbn: string | undefined): Promise<BoardsDataStore.Data> {
-    if (!fqbn) {
-      return BoardsDataStore.Data.EMPTY;
+        data = { configOptions: boardDetails.configOptions, programmers: boardDetails.programmers };
+        await this.storageService.setData(key, data);
+        return data;
     }
 
-    const key = this.getStorageKey(fqbn);
-    const storedData = await this.storageService.getData<
-      BoardsDataStore.Data | undefined
-    >(key, undefined);
-    if (BoardsDataStore.Data.is(storedData)) {
-      return storedData;
-    }
+    async selectProgrammer(
+        { fqbn, selectedProgrammer }: { fqbn: string, selectedProgrammer: Programmer },
+        boardsPackageVersion: MaybePromise<Installable.Version | undefined> = this.getBoardsPackageVersion(fqbn)): Promise<boolean> {
 
-    const boardDetails = await this.loadBoardDetails(fqbn);
-    if (!boardDetails) {
-      return BoardsDataStore.Data.EMPTY;
-    }
-
-    const data = createDataStoreEntry(boardDetails);
-    await this.storageService.setData(key, data);
-    return 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;
-    }
-
-    const change: BoardsDataStoreChange = {
-      fqbn: sanitizedFQBN,
-      data: { ...storedData, selectedProgrammer },
-    };
-    await this.setData(change);
-    this.fireChanged(change);
-    return true;
-  }
-
-  async selectConfigOption(params: SelectConfigOptionParams): Promise<boolean> {
-    const { fqbn, optionsToUpdate } = params;
-    if (!optionsToUpdate.length) {
-      return 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;
+        const data = deepClone(await this.getData(fqbn, boardsPackageVersion));
+        const { programmers } = data;
+        if (!programmers.find(p => Programmer.equals(selectedProgrammer, p))) {
+            return false;
         }
-      }
+
+        const version = await boardsPackageVersion;
+        if (!version) {
+            return false;
+        }
+
+        await this.setData({ fqbn, data: { ...data, selectedProgrammer }, version });
+        this.fireChanged();
+        return true;
     }
 
-    if (!didChange) {
-      return false;
+    async selectConfigOption(
+        { fqbn, option, selectedValue }: { fqbn: string, option: string, selectedValue: string },
+        boardsPackageVersion: MaybePromise<Installable.Version | undefined> = this.getBoardsPackageVersion(fqbn)): Promise<boolean> {
+
+        const data = deepClone(await this.getData(fqbn, boardsPackageVersion));
+        const { configOptions } = data;
+        const configOption = configOptions.find(c => c.option === option);
+        if (!configOption) {
+            return false;
+        }
+        let updated = false;
+        for (const value of configOption.values) {
+            if (value.value === selectedValue) {
+                (value as any).selected = true;
+                updated = true;
+            } else {
+                (value as any).selected = false;
+            }
+        }
+        if (!updated) {
+            return false;
+        }
+        const version = await boardsPackageVersion;
+        if (!version) {
+            return false;
+        }
+
+        await this.setData({ fqbn, data, version });
+        this.fireChanged();
+        return true;
     }
 
-    const change: BoardsDataStoreChange = {
-      fqbn: sanitizedFQBN,
-      data: mutableData,
-    };
-    await this.setData(change);
-    this.fireChanged(change);
-    return true;
-  }
+    protected async setData(
+        { fqbn, data, version }: { fqbn: string, data: BoardsDataStore.Data, version: Installable.Version }): Promise<void> {
 
-  protected async setData(change: BoardsDataStoreChange): Promise<void> {
-    const { fqbn, data } = change;
-    const key = this.getStorageKey(fqbn);
-    return this.storageService.setData(key, data);
-  }
-
-  protected getStorageKey(fqbn: string): string {
-    return `.arduinoIDE-configOptions-${fqbn}`;
-  }
-
-  async loadBoardDetails(
-    fqbn: string,
-    forceRefresh = false
-  ): Promise<BoardDetails | undefined> {
-    try {
-      const details = await this.boardsService.getBoardDetails({
-        fqbn,
-        forceRefresh,
-      });
-      return details;
-    } catch (err) {
-      if (
-        err instanceof Error &&
-        err.message.includes('loading board data') &&
-        err.message.includes('is not installed')
-      ) {
-        this.logger.warn(
-          `The boards package is not installed for board with FQBN: ${fqbn}`
-        );
-      } else {
-        this.logger.error(
-          `An unexpected error occurred while retrieving the board details for ${fqbn}.`,
-          err
-        );
-      }
-      return undefined;
+        const key = this.getStorageKey(fqbn, version);
+        return this.storageService.setData(key, data);
+    }
+
+    protected getStorageKey(fqbn: string, version: Installable.Version): string {
+        return `.arduinoIDE-configOptions-${version}-${fqbn}`;
+    }
+
+    protected async getBoardDetailsSafe(fqbn: string): Promise<BoardDetails | undefined> {
+        try {
+            const details = this.boardsService.getBoardDetails({ fqbn });
+            return details;
+        } catch (err) {
+            if (err instanceof Error && err.message.includes('loading board data') && err.message.includes('is not installed')) {
+                this.logger.warn(`The boards package is not installed for board with FQBN: ${fqbn}`);
+            } else {
+                this.logger.error(`An unexpected error occurred while retrieving the board details for ${fqbn}.`, err);
+            }
+            return undefined;
+        }
+    }
+
+    protected fireChanged(): void {
+        this.onChangedEmitter.fire();
+    }
+
+    protected async getBoardsPackageVersion(fqbn: string | undefined): Promise<Installable.Version | undefined> {
+        if (!fqbn) {
+            return undefined;
+        }
+        const boardsPackage = await this.boardsService.getContainerBoardPackage({ fqbn });
+        if (!boardsPackage) {
+            return undefined;
+        }
+        return boardsPackage.installedVersion;
     }
-  }
 
-  protected fireChanged(...changes: BoardsDataStoreChange[]): void {
-    this.onDidChangeEmitter.fire({ changes });
-  }
 }
 
 export namespace BoardsDataStore {
-  export interface Data {
-    readonly configOptions: ConfigOption[];
-    readonly programmers: Programmer[];
-    readonly selectedProgrammer?: Programmer;
-    readonly defaultProgrammerId?: string;
-  }
-  export namespace Data {
-    export const EMPTY: Data = deepFreeze({
-      configOptions: [],
-      programmers: [],
-    });
-
-    export function is(arg: unknown): arg is Data {
-      return (
-        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 interface Data {
+        readonly configOptions: ConfigOption[];
+        readonly programmers: Programmer[];
+        readonly selectedProgrammer?: Programmer;
+    }
+    export namespace Data {
+        export const EMPTY: Data = {
+            configOptions: [],
+            programmers: []
+        };
+        export function is(arg: any): arg is Data {
+            return !!arg
+                && 'configOptions' in arg && Array.isArray(arg['configOptions'])
+                && 'programmers' in arg && Array.isArray(arg['programmers'])
+        }
     }
-  }
 }
-
-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

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

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

@@ -1,352 +1,193 @@
-import { TabBarToolbar } from '@theia/core/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar';
-import { codicon } from '@theia/core/lib/browser/widgets/widget';
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
 import { CommandRegistry } from '@theia/core/lib/common/command';
-import {
-  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 { 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';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { Port } from '../../common/protocol';
+import { BoardsConfig } from './boards-config';
+import { ArduinoCommands } from '../arduino-commands';
+import { BoardsServiceProvider, AvailableBoard } from './boards-service-provider';
 
 export interface BoardsDropDownListCoords {
-  readonly top: number;
-  readonly left: number;
-  readonly width: number;
-  readonly paddingTop: number;
+    readonly top: number;
+    readonly left: number;
+    readonly width: number;
+    readonly paddingTop: number;
 }
 
 export namespace BoardsDropDown {
-  export interface Props {
-    readonly coords: BoardsDropDownListCoords | 'hidden';
-    readonly boardList: BoardListUI;
-    readonly openBoardsConfig: () => void;
-    readonly hide: () => void;
-  }
+    export interface Props {
+        readonly coords: BoardsDropDownListCoords | 'hidden';
+        readonly items: Array<AvailableBoard & { onClick: () => void, port: Port }>;
+        readonly openBoardsConfig: () => void;
+    }
 }
 
-export class BoardListDropDown extends React.Component<BoardsDropDown.Props> {
-  private dropdownElement: HTMLElement;
-  private listRef: React.RefObject<HTMLDivElement>;
+export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
 
-  constructor(props: BoardsDropDown.Props) {
-    super(props);
-    this.listRef = React.createRef();
-    let list = document.getElementById('boards-dropdown-container');
-    if (!list) {
-      list = document.createElement('div');
-      list.id = 'boards-dropdown-container';
-      document.body.appendChild(list);
-      this.dropdownElement = list;
+    protected dropdownElement: HTMLElement;
+
+    constructor(props: BoardsDropDown.Props) {
+        super(props);
+
+        let list = document.getElementById('boards-dropdown-container');
+        if (!list) {
+            list = document.createElement('div');
+            list.id = 'boards-dropdown-container';
+            document.body.appendChild(list);
+            this.dropdownElement = list;
+        }
     }
-  }
 
-  override componentDidUpdate(prevProps: BoardsDropDown.Props): void {
-    if (prevProps.coords === 'hidden' && this.listRef.current) {
-      this.listRef.current.focus();
+    render(): React.ReactNode {
+        return ReactDOM.createPortal(this.renderNode(), this.dropdownElement);
     }
-  }
 
-  override render(): React.ReactNode {
-    return ReactDOM.createPortal(
-      this.renderBoardListItems(),
-      this.dropdownElement
-    );
-  }
-
-  private renderBoardListItems(): React.ReactNode {
-    const { coords, boardList } = this.props;
-    if (coords === 'hidden') {
-      return '';
-    }
-    const footerLabel = nls.localize(
-      'arduino/board/openBoardsConfig',
-      'Select other board and port…'
-    );
-    return (
-      <div
-        className="arduino-boards-dropdown-list"
-        style={{
-          position: 'absolute',
-          ...coords,
-        }}
-        ref={this.listRef}
-        tabIndex={0}
-      >
-        <div className="arduino-boards-dropdown-list--items-container">
-          {boardList.items.map((item, index) =>
-            this.renderBoardListItem({
-              item,
-              selected: index === boardList.selectedIndex,
-            })
-          )}
+    protected renderNode(): React.ReactNode {
+        const { coords, items } = this.props;
+        if (coords === 'hidden') {
+            return '';
+        }
+        return <div className='arduino-boards-dropdown-list'
+            style={{
+                position: 'absolute',
+                ...coords
+            }}>
+            {this.renderItem({
+                label: 'Select Other Board & Port',
+                onClick: () => this.props.openBoardsConfig()
+            })}
+            {items.map(({ name, port, selected, onClick }) => ({ label: `${name} at ${Port.toString(port)}`, selected, onClick })).map(this.renderItem)}
         </div>
-        <div
-          key={footerLabel}
-          tabIndex={0}
-          className="arduino-boards-dropdown-item arduino-board-dropdown-footer"
-          onClick={() => this.props.openBoardsConfig()}
-        >
-          <div>{footerLabel}</div>
-        </div>
-      </div>
-    );
-  }
-
-  private readonly onDefaultAction = (item: BoardListItemUI): unknown => {
-    const { boardList, hide } = this.props;
-    const { type, params } = item.defaultAction;
-    hide();
-    switch (type) {
-      case 'select-boards-config': {
-        return boardList.select(params);
-      }
-      case 'edit-boards-config': {
-        return boardList.edit(params);
-      }
-      default:
-        return assertUnreachable(type);
     }
-  };
 
-  private renderBoardListItem({
-    item,
-    selected,
-  }: {
-    item: BoardListItemUI;
-    selected: boolean;
-  }): React.ReactNode {
-    const { boardLabel, portLabel, portProtocol, tooltip } = item.labels;
-    const port = item.port;
-    const onKeyUp = (e: React.KeyboardEvent) => {
-      if (e.key === 'Enter') {
-        this.onDefaultAction(item);
-      }
-    };
-    return (
-      <div
-        key={`board-item--${Port.keyOf(port)}`}
-        className={classNames('arduino-boards-dropdown-item', {
-          'arduino-boards-dropdown-item--selected': selected,
-        })}
-        onClick={() => this.onDefaultAction(item)}
-        onKeyUp={onKeyUp}
-        tabIndex={0}
-      >
-        <div
-          className={classNames(
-            'arduino-boards-dropdown-item--protocol',
-            'fa',
-            iconNameFromProtocol(portProtocol)
-          )}
-        />
-        <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}
+    protected renderItem({ label, selected, onClick }: { label: string, selected?: boolean, onClick: () => void }): React.ReactNode {
+        return <div key={label} className={`arduino-boards-dropdown-item ${selected ? 'selected' : ''}`} onClick={onClick}>
+            <div>
+                {label}
             </div>
-          </div>
-          <div className="arduino-boards-dropdown-item--port-label noWrapInfo noselect">
-            {portLabel}
-          </div>
+            {selected ? <span className='fa fa-check' /> : ''}
         </div>
-        {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>
-    );
-  }
+
 }
 
-export class BoardsToolBarItem extends React.Component<
-  BoardsToolBarItem.Props,
-  BoardsToolBarItem.State
-> {
-  static TOOLBAR_ID: 'boards-toolbar';
+export class BoardsToolBarItem extends React.Component<BoardsToolBarItem.Props, BoardsToolBarItem.State> {
 
-  private readonly toDispose: DisposableCollection;
+    static TOOLBAR_ID: 'boards-toolbar';
 
-  constructor(props: BoardsToolBarItem.Props) {
-    super(props);
-    const { boardList } = props.boardsServiceProvider;
-    this.state = {
-      boardList,
-      coords: 'hidden',
-    };
-    const listener = () => this.setState({ coords: 'hidden' });
-    document.addEventListener('click', listener);
-    this.toDispose = new DisposableCollection(
-      Disposable.create(() => document.removeEventListener('click', listener))
-    );
-  }
+    protected readonly toDispose: DisposableCollection = new DisposableCollection();
 
-  override componentDidMount(): void {
-    this.toDispose.push(
-      this.props.boardsServiceProvider.onBoardListDidChange((boardList) =>
-        this.setState({ boardList })
-      )
-    );
-  }
+    constructor(props: BoardsToolBarItem.Props) {
+        super(props);
 
-  override componentWillUnmount(): void {
-    this.toDispose.dispose();
-  }
+        const { availableBoards } = props.boardsServiceClient;
+        this.state = {
+            availableBoards,
+            coords: 'hidden'
+        };
 
-  private readonly show = (event: React.MouseEvent<HTMLElement>): void => {
-    const { currentTarget: element } = event;
-    if (element instanceof HTMLElement) {
-      if (this.state.coords === 'hidden') {
-        const rect = element.getBoundingClientRect();
-        this.setState({
-          coords: {
-            top: rect.top,
-            left: rect.left,
-            width: rect.width,
-            paddingTop: rect.height,
-          },
+        document.addEventListener('click', () => {
+            this.setState({ coords: 'hidden' });
         });
-      } else {
-        this.setState({ coords: 'hidden' });
-      }
     }
-    event.stopPropagation();
-    event.nativeEvent.stopImmediatePropagation();
-  };
 
-  private readonly hide = () => {
-    this.setState({ coords: 'hidden' });
-  };
+    componentDidMount() {
+        this.props.boardsServiceClient.onAvailableBoardsChanged(availableBoards => this.setState({ availableBoards }));
+    }
+
+    componentWillUnmount(): void {
+        this.toDispose.dispose();
+    }
+
+    protected readonly show = (event: React.MouseEvent<HTMLElement>) => {
+        const { currentTarget: element } = event;
+        if (element instanceof HTMLElement) {
+            if (this.state.coords === 'hidden') {
+                const rect = element.getBoundingClientRect();
+                this.setState({
+                    coords: {
+                        top: rect.top,
+                        left: rect.left,
+                        width: rect.width,
+                        paddingTop: rect.height
+                    }
+                });
+            } else {
+                this.setState({ coords: 'hidden' });
+            }
+        }
+        event.stopPropagation();
+        event.nativeEvent.stopImmediatePropagation();
+    };
+
+    render(): React.ReactNode {
+        const { coords, availableBoards } = this.state;
+        const boardsConfig = this.props.boardsServiceClient.boardsConfig;
+        const title = BoardsConfig.Config.toString(boardsConfig, { default: 'no board selected' });
+        const decorator = (() => {
+            const selectedBoard = availableBoards.find(({ selected }) => selected);
+            if (!selectedBoard || !selectedBoard.port) {
+                return 'fa fa-times notAttached'
+            }
+            if (selectedBoard.state === AvailableBoard.State.guessed) {
+                return 'fa fa-exclamation-triangle guessed'
+            }
+            return ''
+        })();
+
+        return <React.Fragment>
+            <div className='arduino-boards-toolbar-item-container'>
+                <div className='arduino-boards-toolbar-item' title={title}>
+                    <div className='inner-container' onClick={this.show}>
+                        <span className={decorator} />
+                        <div className='label noWrapInfo'>
+                            <div className='noWrapInfo noselect'>
+                                {title}
+                            </div>
+                        </div>
+                        <span className='fa fa-caret-down caret' />
+                    </div>
+                </div>
+            </div>
+            <BoardsDropDown
+                coords={coords}
+                items={availableBoards.filter(AvailableBoard.hasPort).map(board => ({
+                    ...board,
+                    onClick: () => {
+                        if (board.state === AvailableBoard.State.incomplete) {
+                            this.props.boardsServiceClient.boardsConfig = {
+                                selectedPort: board.port
+                            };
+                            this.openDialog();
+                        } else {
+                            this.props.boardsServiceClient.boardsConfig = {
+                                selectedBoard: board,
+                                selectedPort: board.port
+                            }
+                        }
+                    }
+                }))}
+                openBoardsConfig={this.openDialog}>
+            </BoardsDropDown>
+        </React.Fragment>;
+    }
+
+    protected openDialog = () => {
+        this.props.commands.executeCommand(ArduinoCommands.OPEN_BOARDS_DIALOG.id);
+        this.setState({ coords: 'hidden' });
+    };
 
-  override render(): React.ReactNode {
-    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={tooltip}
-          onClick={this.show}
-        >
-          {protocolIcon && <div className={protocolIconClassNames} />}
-          <div
-            className={classNames(
-              'arduino-boards-toolbar-item--label',
-              'noWrapInfo',
-              'noselect',
-              { 'arduino-boards-toolbar-item--label-connected': selected }
-            )}
-          >
-            {boardLabel}
-          </div>
-          <div className="fa fa-caret-down caret" />
-        </div>
-        <BoardListDropDown
-          coords={coords}
-          boardList={boardList}
-          openBoardsConfig={() => boardList.edit({ query: '' })}
-          hide={this.hide}
-        />
-      </React.Fragment>
-    );
-  }
 }
 export namespace BoardsToolBarItem {
-  export interface Props {
-    readonly boardsServiceProvider: BoardsServiceProvider;
-    readonly commands: CommandRegistry;
-  }
 
-  export interface State {
-    boardList: BoardListUI;
-    coords: BoardsDropDownListCoords | 'hidden';
-  }
-}
+    export interface Props {
+        readonly boardsServiceClient: BoardsServiceProvider;
+        readonly commands: CommandRegistry;
+    }
+
+    export interface State {
+        availableBoards: AvailableBoard[];
+        coords: BoardsDropDownListCoords | 'hidden';
+    }
 
-function iconNameFromProtocol(protocol: string): string {
-  switch (protocol) {
-    case 'serial':
-      return 'fa-arduino-technology-usb';
-    case 'network':
-      return 'fa-arduino-technology-connection';
-    // 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';
-  }
 }

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

@@ -1,40 +1,26 @@
-import { injectable } from '@theia/core/shared/inversify';
-import {
-  BoardSearch,
-  BoardsPackage,
-} from '../../common/protocol/boards-service';
-import { URI } from '../contributions/contribution';
-import { ListWidgetFrontendContribution } from '../widgets/component-list/list-widget-frontend-contribution';
+import { injectable } from 'inversify';
 import { BoardsListWidget } from './boards-list-widget';
+import { BoardsPackage } from '../../common/protocol/boards-service';
+import { ListWidgetFrontendContribution } from '../widgets/component-list/list-widget-frontend-contribution';
 
 @injectable()
-export class BoardsListWidgetFrontendContribution extends ListWidgetFrontendContribution<
-  BoardsPackage,
-  BoardSearch
-> {
-  constructor() {
-    super({
-      widgetId: BoardsListWidget.WIDGET_ID,
-      widgetName: BoardsListWidget.WIDGET_LABEL,
-      defaultWidgetOptions: {
-        area: 'left',
-        rank: 2,
-      },
-      toggleCommandId: `${BoardsListWidget.WIDGET_ID}:toggle`,
-      toggleKeybinding: 'CtrlCmd+Shift+B',
-    });
-  }
+export class BoardsListWidgetFrontendContribution extends ListWidgetFrontendContribution<BoardsPackage> {
 
-  protected canParse(uri: URI): boolean {
-    try {
-      BoardSearch.UriParser.parse(uri);
-      return true;
-    } catch {
-      return false;
+    constructor() {
+        super({
+            widgetId: BoardsListWidget.WIDGET_ID,
+            widgetName: BoardsListWidget.WIDGET_LABEL,
+            defaultWidgetOptions: {
+                area: 'left',
+                rank: 600
+            },
+            toggleCommandId: `${BoardsListWidget.WIDGET_ID}:toggle`,
+            toggleKeybinding: 'CtrlCmd+Shift+B'
+        });
+    }
+
+    async initializeLayout(): Promise<void> {
+        this.openView();
     }
-  }
 
-  protected parse(uri: URI): BoardSearch | undefined {
-    return BoardSearch.UriParser.parse(uri);
-  }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,123 +0,0 @@
-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,409 +1,222 @@
-import {
-  Disposable,
-  DisposableCollection,
-} from '@theia/core/lib/common/disposable';
-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 { inject, injectable } from 'inversify';
+import { remote } from 'electron';
+import { MenuModelRegistry } from '@theia/core/lib/common/menu';
+import { DisposableCollection, Disposable } from '@theia/core/lib/common/disposable';
+import { firstToUpperCase } from '../../common/utils';
+import { BoardsConfig } from '../boards/boards-config';
 import { MainMenuManager } from '../../common/main-menu-manager';
-import {
-  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 { BoardsDataStore } from '../boards/boards-data-store';
-import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import {
-  ArduinoMenus,
-  PlaceholderMenuNode,
-  unregisterSubmenu,
-} from '../menu/arduino-menus';
 import { NotificationCenter } from '../notification-center';
-import { Command, CommandRegistry, SketchContribution } from './contribution';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import { ArduinoMenus, PlaceholderMenuNode, unregisterSubmenu } from '../menu/arduino-menus';
+import { BoardsService, InstalledBoardWithPackage, AvailablePorts, Port } from '../../common/protocol';
+import { SketchContribution, Command, CommandRegistry } from './contribution';
 
 @injectable()
 export class BoardSelection extends SketchContribution {
-  @inject(CommandRegistry)
-  private readonly commandRegistry: CommandRegistry;
-  @inject(MainMenuManager)
-  private readonly mainMenuManager: MainMenuManager;
-  @inject(MenuModelRegistry)
-  private readonly menuModelRegistry: MenuModelRegistry;
-  @inject(NotificationCenter)
-  private readonly notificationCenter: NotificationCenter;
-  @inject(BoardsDataStore)
-  private readonly boardsDataStore: BoardsDataStore;
-  @inject(BoardsService)
-  private readonly boardsService: BoardsService;
-  @inject(BoardsServiceProvider)
-  private readonly boardsServiceProvider: BoardsServiceProvider;
 
-  private readonly toDisposeBeforeMenuRebuild = new DisposableCollection();
-  // do not query installed platforms on every change
-  private _installedBoards: Deferred<InstalledBoardWithPackage[]> | undefined;
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
 
-  override registerCommands(registry: CommandRegistry): void {
-    registry.registerCommand(BoardSelection.Commands.GET_BOARD_INFO, {
-      execute: async () => {
-        const boardInfo = await getBoardInfo(
-          this.boardsServiceProvider.boardList
-        );
-        if (typeof boardInfo === 'string') {
-          this.messageService.info(boardInfo);
-          return;
-        }
-        const { BN, VID, PID, SN } = boardInfo;
-        const detail = `
-BN: ${BN}
-VID: ${VID}
-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')],
-        });
-      },
-    });
+    @inject(MainMenuManager)
+    protected readonly mainMenuManager: MainMenuManager;
 
-    registry.registerCommand(BoardSelection.Commands.RELOAD_BOARD_DATA, {
-      execute: async () => {
-        const selectedFqbn =
-          this.boardsServiceProvider.boardList.boardsConfig.selectedBoard?.fqbn;
-        let message: string;
+    @inject(MenuModelRegistry)
+    protected readonly menuModelRegistry: MenuModelRegistry;
 
-        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.'
-          );
-        }
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
 
-        this.messageService.info(message, { timeout: 2000 });
-      },
-    });
-  }
+    @inject(BoardsService)
+    protected readonly boardsService: BoardsService;
 
-  override onStart(): void {
-    this.notificationCenter.onPlatformDidInstall(() => this.updateMenus(true));
-    this.notificationCenter.onPlatformDidUninstall(() =>
-      this.updateMenus(true)
-    );
-    this.boardsServiceProvider.onBoardListDidChange(() => this.updateMenus());
-  }
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceProvider: BoardsServiceProvider;
 
-  override async onReady(): Promise<void> {
-    this.updateMenus();
-  }
+    protected readonly toDisposeBeforeMenuRebuild = new DisposableCollection();
 
-  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);
-  }
-
-  private rebuildMenus(
-    installedBoards: InstalledBoardWithPackage[],
-    boardList: BoardList
-  ): void {
-    this.toDisposeBeforeMenuRebuild.dispose();
-
-    // Boards submenu
-    const boardsSubmenuPath = [
-      ...ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP,
-      '1_boards',
-    ];
-    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(
-      boardsSubmenuPath,
-      nls.localize(
-        'arduino/board/board',
-        'Board{0}',
-        !!boardsSubmenuLabel ? `: "${boardsSubmenuLabel}"` : ''
-      ),
-      { order: '100' }
-    );
-    this.toDisposeBeforeMenuRebuild.push(
-      Disposable.create(() =>
-        unregisterSubmenu(boardsSubmenuPath, this.menuModelRegistry)
-      )
-    );
-
-    // Ports submenu
-    const portsSubmenuPath = ArduinoMenus.TOOLS__PORTS_SUBMENU;
-    const portsSubmenuLabel = selectedPort?.address;
-    this.menuModelRegistry.registerSubmenu(
-      portsSubmenuPath,
-      nls.localize(
-        'arduino/board/port',
-        'Port{0}',
-        portsSubmenuLabel ? `: "${portsSubmenuLabel}"` : ''
-      ),
-      { order: '101' }
-    );
-    this.toDisposeBeforeMenuRebuild.push(
-      Disposable.create(() =>
-        unregisterSubmenu(portsSubmenuPath, this.menuModelRegistry)
-      )
-    );
-
-    const 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'),
-      order: '103',
-    };
-    this.menuModelRegistry.registerMenuAction(
-      ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP,
-      getBoardInfo
-    );
-    this.toDisposeBeforeMenuRebuild.push(
-      Disposable.create(() =>
-        this.menuModelRegistry.unregisterMenuAction(getBoardInfo)
-      )
-    );
-
-    const boardsManagerGroup = [...boardsSubmenuPath, '0_manager'];
-    const boardsPackagesGroup = [...boardsSubmenuPath, '1_packages'];
-
-    this.menuModelRegistry.registerMenuAction(boardsManagerGroup, {
-      commandId: `${BoardsListWidget.WIDGET_ID}:toggle`,
-      label: `${BoardsListWidget.WIDGET_LABEL}...`,
-    });
-
-    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 } = board;
-      const { vendorId } = packageId;
-      let boardsPerPackageName = groupedBoards.get(packageName);
-      if (!boardsPerPackageName) {
-        boardsPerPackageName = {} as BoardsPerVendor;
-        groupedBoards.set(packageName, boardsPerPackageName);
-      }
-      let boardPerVendor: BoardWithPackage[] | undefined =
-        boardsPerPackageName[vendorId];
-      if (!boardPerVendor) {
-        boardPerVendor = [];
-        boardsPerPackageName[vendorId] = boardPerVendor;
-      }
-      boardPerVendor.push(board);
-    }
-
-    // Installed boards
-    Array.from(groupedBoards.entries()).forEach(
-      ([packageName, boardsPerPackage]) => {
-        const useVendorSuffix = Object.keys(boardsPerPackage).length > 1;
-        Object.entries(boardsPerPackage).forEach(([vendorId, boards]) => {
-          let platformMenuPath: MenuPath | undefined = undefined;
-          boards.forEach((board, index) => {
-            const { packageId, fqbn, name, manuallyInstalled } = board;
-            // create the platform submenu once.
-            // creating and registering the same submenu twice in Theia is a noop, though.
-            if (!platformMenuPath) {
-              let packageLabel =
-                packageName +
-                `${
-                  manuallyInstalled
-                    ? nls.localize(
-                        'arduino/board/inSketchbook',
-                        ' (in Sketchbook)'
-                      )
-                    : ''
-                }`;
-              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(),
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(BoardSelection.Commands.GET_BOARD_INFO, {
+            execute: async () => {
+                const { selectedBoard, selectedPort } = this.boardsServiceProvider.boardsConfig;
+                if (!selectedBoard) {
+                    this.messageService.info('Please select a board to obtain board info.');
+                    return;
+                }
+                if (!selectedBoard.fqbn) {
+                    this.messageService.info(`The platform for the selected '${selectedBoard.name}' board is not installed.`);
+                    return;
+                }
+                if (!selectedPort) {
+                    this.messageService.info('Please select a port to obtain board info.');
+                    return;
+                }
+                const boardDetails = await this.boardsService.getBoardDetails({ fqbn: selectedBoard.fqbn });
+                if (boardDetails) {
+                    const { VID, PID } = boardDetails;
+                    const detail = `BN: ${selectedBoard.name}
+VID: ${VID}
+PID: ${PID}`;
+                    await remote.dialog.showMessageBox(remote.getCurrentWindow(), {
+                        message: 'Board Info',
+                        title: 'Board Info',
+                        type: 'info',
+                        detail,
+                        buttons: ['OK']
+                    });
                 }
-              );
             }
+        });
+    }
+
+    onStart(): void {
+        this.updateMenus();
+        this.notificationCenter.onPlatformInstalled(this.updateMenus.bind(this));
+        this.notificationCenter.onPlatformUninstalled(this.updateMenus.bind(this));
+        this.boardsServiceProvider.onBoardsConfigChanged(this.updateMenus.bind(this));
+        this.boardsServiceProvider.onAvailableBoardsChanged(this.updateMenus.bind(this));
+    }
+
+    protected async updateMenus(): Promise<void> {
+        const [installedBoards, availablePorts, config] = await Promise.all([
+            this.installedBoards(),
+            this.boardsService.getState(),
+            this.boardsServiceProvider.boardsConfig
+        ]);
+        this.rebuildMenus(installedBoards, availablePorts, config);
+    }
+
+    protected rebuildMenus(installedBoards: InstalledBoardWithPackage[], availablePorts: AvailablePorts, config: BoardsConfig.Config): void {
+        this.toDisposeBeforeMenuRebuild.dispose();
+
+        // Boards submenu
+        const boardsSubmenuPath = [...ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP, '1_boards'];
+        const boardsSubmenuLabel = config.selectedBoard?.name;
+        // Note: The submenu order starts from `100` because `Auto Format`, `Serial Monitor`, etc starts from `0` index.
+        // The board specific items, and the rest, have order with `z`. We needed something between `0` and `z` with natural-order.
+        this.menuModelRegistry.registerSubmenu(boardsSubmenuPath, `Board${!!boardsSubmenuLabel ? `: "${boardsSubmenuLabel}"` : ''}`, { order: '100' });
+        this.toDisposeBeforeMenuRebuild.push(Disposable.create(() => unregisterSubmenu(boardsSubmenuPath, this.menuModelRegistry)));
+
+        // Ports submenu
+        const portsSubmenuPath = [...ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP, '2_ports'];
+        const portsSubmenuLabel = config.selectedPort?.address;
+        this.menuModelRegistry.registerSubmenu(portsSubmenuPath, `Port${!!portsSubmenuLabel ? `: "${portsSubmenuLabel}"` : ''}`, { order: '101' });
+        this.toDisposeBeforeMenuRebuild.push(Disposable.create(() => unregisterSubmenu(portsSubmenuPath, this.menuModelRegistry)));
+
+        const getBoardInfo = { commandId: BoardSelection.Commands.GET_BOARD_INFO.id, label: 'Get Board Info', order: '103' };
+        this.menuModelRegistry.registerMenuAction(ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP, getBoardInfo);
+        this.toDisposeBeforeMenuRebuild.push(Disposable.create(() => this.menuModelRegistry.unregisterMenuAction(getBoardInfo)));
+
+        const boardsManagerGroup = [...boardsSubmenuPath, '0_manager'];
+        const boardsPackagesGroup = [...boardsSubmenuPath, '1_packages'];
+
+        this.menuModelRegistry.registerMenuAction(boardsManagerGroup, {
+            commandId: `${BoardsListWidget.WIDGET_ID}:toggle`,
+            label: 'Boards Manager...'
+        });
+
+        // Installed boards
+        for (const board of installedBoards) {
+            const { packageId, packageName, fqbn, name } = board;
+
+            // Platform submenu
+            const platformMenuPath = [...boardsPackagesGroup, packageId];
+            // Note: Registering the same submenu twice is a noop. No need to group the boards per platform.
+            this.menuModelRegistry.registerSubmenu(platformMenuPath, packageName);
 
             const id = `arduino-select-board--${fqbn}`;
             const command = { id };
             const handler = {
-              execute: () =>
-                this.boardsServiceProvider.updateConfig({
-                  name: name,
-                  fqbn: fqbn,
-                }),
-              isToggled: () => fqbn === selectedBoard?.fqbn,
+                execute: () => {
+                    if (fqbn !== this.boardsServiceProvider.boardsConfig.selectedBoard?.fqbn) {
+                        this.boardsServiceProvider.boardsConfig = {
+                            selectedBoard: {
+                                name,
+                                fqbn,
+                                port: this.boardsServiceProvider.boardsConfig.selectedBoard?.port // TODO: verify!
+                            },
+                            selectedPort: this.boardsServiceProvider.boardsConfig.selectedPort
+                        }
+                    }
+                },
+                isToggled: () => fqbn === this.boardsServiceProvider.boardsConfig.selectedBoard?.fqbn
             };
 
             // Board menu
-            const menuAction = {
-              commandId: id,
-              label: name,
-              order: String(index).padStart(4), // pads with leading zeros for alphanumeric sort where order is 1, 2, 11, and NOT 1, 11, 2
-            };
+            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
-            );
+            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,
-      ports: ReturnType<BoardList['ports']>,
-      protocolOrder: number
-    ) => {
-      if (!ports.length) {
-        return;
-      }
-
-      // Register placeholder for protocol
-      const menuPath = [
-        ...portsSubmenuPath,
-        `${protocolOrder.toString()}_${protocol}`,
-      ];
-      const placeholder = new PlaceholderMenuNode(
-        menuPath,
-        nls.localize(
-          'arduino/board/typeOfPorts',
-          '{0} ports',
-          Port.Protocols.protocolLabel(protocol)
-        ),
-        { order: protocolOrder.toString().padStart(4) }
-      );
-      this.menuModelRegistry.registerMenuNode(menuPath, placeholder);
-      this.toDisposeBeforeMenuRebuild.push(
-        Disposable.create(() =>
-          this.menuModelRegistry.unregisterMenuNode(placeholder.id)
-        )
-      );
-
-      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--${portKey}`;
-        const command = { id };
-        const handler = {
-          execute: () => {
-            this.boardsServiceProvider.updateConfig({
-              protocol: port.protocol,
-              address: port.address,
-            });
-          },
-          isToggled: () => {
-            return i === ports.matchingIndex;
-          },
-        };
-        const menuAction = {
-          commandId: id,
-          label,
-          order: String(protocolOrder + i + 1).padStart(4),
-        };
-        this.commandRegistry.registerCommand(command, handler);
-        this.toDisposeBeforeMenuRebuild.push(
-          Disposable.create(() =>
-            this.commandRegistry.unregisterCommand(command)
-          )
-        );
-        this.menuModelRegistry.registerMenuAction(menuPath, menuAction);
-      }
-    };
 
-    const groupedPorts = boardList.portsGroupedByProtocol();
-    let protocolOrder = 100;
-    Object.entries(groupedPorts).forEach(([protocol, ports]) => {
-      registerPorts(protocol, ports, protocolOrder);
-      protocolOrder += 100;
-    });
-    this.mainMenuManager.update();
-  }
+        // Installed ports
+        const registerPorts = (ports: AvailablePorts) => {
+            const addresses = Object.keys(ports);
+            if (!addresses.length) {
+                return;
+            }
+
+            // Register placeholder for protocol
+            const [port] = ports[addresses[0]];
+            const protocol = port.protocol;
+            const menuPath = [...portsSubmenuPath, protocol];
+            const placeholder = new PlaceholderMenuNode(menuPath, `${firstToUpperCase(port.protocol)} ports`);
+            this.menuModelRegistry.registerMenuNode(menuPath, placeholder);
+            this.toDisposeBeforeMenuRebuild.push(Disposable.create(() => this.menuModelRegistry.unregisterMenuNode(placeholder.id)));
+
+            for (const address of addresses) {
+                if (!!ports[address]) {
+                    const [port, boards] = ports[address];
+                    if (!boards.length) {
+                        boards.push({
+                            name: ''
+                        });
+                    }
+                    for (const { name, fqbn } of boards) {
+                        const id = `arduino-select-port--${address}${fqbn ? `--${fqbn}` : ''}`;
+                        const command = { id };
+                        const handler = {
+                            execute: () => {
+                                if (!Port.equals(port, this.boardsServiceProvider.boardsConfig.selectedPort)) {
+                                    this.boardsServiceProvider.boardsConfig = {
+                                        selectedBoard: this.boardsServiceProvider.boardsConfig.selectedBoard,
+                                        selectedPort: port
+                                    }
+                                }
+                            },
+                            isToggled: () => Port.equals(port, this.boardsServiceProvider.boardsConfig.selectedPort)
+                        };
+                        const label = `${address}${name ? ` (${name})` : ''}`;
+                        const menuAction = {
+                            commandId: id,
+                            label,
+                            order: `1${label}` // `1` comes after the placeholder which has order `0`
+                        };
+                        this.commandRegistry.registerCommand(command, handler);
+                        this.toDisposeBeforeMenuRebuild.push(Disposable.create(() => this.commandRegistry.unregisterCommand(command)));
+                        this.menuModelRegistry.registerMenuAction(menuPath, menuAction);
+                    }
+                }
+            }
+        }
+
+        const { serial, network, unknown } = AvailablePorts.groupByProtocol(availablePorts);
+        registerPorts(serial);
+        registerPorts(network);
+        registerPorts(unknown);
+
+        this.mainMenuManager.update();
+    }
+
+    protected async installedBoards(): Promise<InstalledBoardWithPackage[]> {
+        const allBoards = await this.boardsService.allBoards({});
+        return allBoards.filter(InstalledBoardWithPackage.is);
+    }
 
-  protected async installedBoards(): Promise<InstalledBoardWithPackage[]> {
-    const allBoards = await this.boardsService.getInstalledBoards();
-    return allBoards.filter(InstalledBoardWithPackage.is);
-  }
 }
 export namespace BoardSelection {
-  export namespace Commands {
-    export const GET_BOARD_INFO: Command = { id: 'arduino-get-board-info' };
-    export const RELOAD_BOARD_DATA: Command = {
-      id: 'arduino-reload-board-data',
-    };
-  }
+    export namespace Commands {
+        export const GET_BOARD_INFO: Command = { id: 'arduino-get-board-info' };
+    }
 }

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

@@ -1,178 +0,0 @@
-import {
-  Disposable,
-  DisposableCollection,
-} from '@theia/core/lib/common/disposable';
-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 {
-  CommandRegistry,
-  Contribution,
-  MenuModelRegistry,
-} from './contribution';
-
-@injectable()
-export class BoardsDataMenuUpdater extends Contribution {
-  @inject(CommandRegistry)
-  private readonly commandRegistry: CommandRegistry;
-  @inject(MenuModelRegistry)
-  private readonly menuRegistry: MenuModelRegistry;
-  @inject(BoardsDataStore)
-  private readonly boardsDataStore: BoardsDataStore;
-  @inject(BoardsServiceProvider)
-  private readonly boardsServiceProvider: BoardsServiceProvider;
-
-  private readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
-  private readonly toDisposeOnBoardChange = new DisposableCollection();
-
-  override onStart(): void {
-    this.boardsDataStore.onDidChange(() =>
-      this.updateMenuActions(
-        this.boardsServiceProvider.boardsConfig.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
-      )
-    );
-  }
-
-  private async updateMenuActions(
-    selectedBoard: BoardIdentifier | undefined
-  ): Promise<void> {
-    return this.queue.add(async () => {
-      this.toDisposeOnBoardChange.dispose();
-      this.menuManager.update();
-      if (selectedBoard) {
-        const { fqbn } = selectedBoard;
-        if (fqbn) {
-          const { configOptions, programmers, selectedProgrammer } =
-            await this.boardsDataStore.getData(fqbn);
-          if (configOptions.length) {
-            const boardsConfigMenuPath = [
-              ...ArduinoMenus.TOOLS__BOARD_SETTINGS_GROUP,
-              'z01_boardsConfig',
-            ]; // `z_` is for ordering.
-            for (const { label, option, values } of configOptions.sort(
-              ConfigOption.LABEL_COMPARATOR
-            )) {
-              const menuPath = [...boardsConfigMenuPath, `${option}`];
-              const commands = new Map<
-                string,
-                Disposable & { label: string }
-              >();
-              let selectedValue = '';
-              for (const value of values) {
-                const id = `${fqbn}-${option}--${value.value}`;
-                const command = { id };
-                const handler = {
-                  execute: () =>
-                    this.boardsDataStore.selectConfigOption({
-                      fqbn,
-                      optionsToUpdate: [{ option, selectedValue: value.value }],
-                    }),
-                  isToggled: () => value.selected,
-                };
-                commands.set(
-                  id,
-                  Object.assign(
-                    this.commandRegistry.registerCommand(command, handler),
-                    { label: value.label }
-                  )
-                );
-                if (value.selected) {
-                  selectedValue = value.label;
-                }
-              }
-              this.menuRegistry.registerSubmenu(
-                menuPath,
-                `${label}${selectedValue ? `: "${selectedValue}"` : ''}`
-              );
-              this.toDisposeOnBoardChange.pushAll([
-                ...commands.values(),
-                Disposable.create(() =>
-                  unregisterSubmenu(menuPath, this.menuRegistry)
-                ),
-                ...Array.from(commands.keys()).map((commandId, i) => {
-                  const { label } = commands.get(commandId)!;
-                  this.menuRegistry.registerMenuAction(menuPath, {
-                    commandId,
-                    order: String(i).padStart(4),
-                    label,
-                  });
-                  return Disposable.create(() =>
-                    this.menuRegistry.unregisterMenuAction(commandId)
-                  );
-                }),
-              ]);
-            }
-          }
-          if (programmers.length) {
-            const programmersMenuPath = [
-              ...ArduinoMenus.TOOLS__BOARD_SETTINGS_GROUP,
-              'z02_programmers',
-            ];
-            const programmerNls = nls.localize(
-              'arduino/board/programmer',
-              'Programmer'
-            );
-            const label = selectedProgrammer
-              ? `${programmerNls}: "${selectedProgrammer.name}"`
-              : programmerNls;
-            this.menuRegistry.registerSubmenu(programmersMenuPath, label);
-            this.toDisposeOnBoardChange.push(
-              Disposable.create(() =>
-                unregisterSubmenu(programmersMenuPath, this.menuRegistry)
-              )
-            );
-            for (const programmer of programmers) {
-              const { id, name } = programmer;
-              const command = { id: `${fqbn}-programmer--${id}` };
-              const handler = {
-                execute: () =>
-                  this.boardsDataStore.selectProgrammer({
-                    fqbn,
-                    selectedProgrammer: programmer,
-                  }),
-                isToggled: () =>
-                  Programmer.equals(programmer, selectedProgrammer),
-              };
-              this.menuRegistry.registerMenuAction(programmersMenuPath, {
-                commandId: command.id,
-                label: name,
-              });
-              this.commandRegistry.registerCommand(command, handler);
-              this.toDisposeOnBoardChange.pushAll([
-                Disposable.create(() =>
-                  this.commandRegistry.unregisterCommand(command)
-                ),
-                Disposable.create(() =>
-                  this.menuRegistry.unregisterMenuAction(command.id)
-                ),
-              ]);
-            }
-          }
-          this.menuManager.update();
-        }
-      }
-    });
-  }
-}

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

@@ -1,92 +1,82 @@
-import { nls } from '@theia/core/lib/common';
-import { injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from 'inversify';
+import { OutputChannelManager } from '@theia/output/lib/common/output-channel';
 import { CoreService } from '../../common/protocol';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import {
-  Command,
-  CommandRegistry,
-  CoreServiceContribution,
-  MenuModelRegistry,
-} from './contribution';
+import { BoardsDataStore } from '../boards/boards-data-store';
+import { MonitorConnection } from '../monitor/monitor-connection';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import { SketchContribution, Command, CommandRegistry, MenuModelRegistry } from './contribution';
 
 @injectable()
-export class BurnBootloader extends CoreServiceContribution {
-  override registerCommands(registry: CommandRegistry): void {
-    registry.registerCommand(BurnBootloader.Commands.BURN_BOOTLOADER, {
-      execute: () => this.burnBootloader(),
-    });
-  }
+export class BurnBootloader extends SketchContribution {
 
-  override registerMenus(registry: MenuModelRegistry): void {
-    registry.registerMenuAction(ArduinoMenus.TOOLS__BOARD_SETTINGS_GROUP, {
-      commandId: BurnBootloader.Commands.BURN_BOOTLOADER.id,
-      label: nls.localize(
-        'arduino/bootloader/burnBootloader',
-        'Burn Bootloader'
-      ),
-      order: 'z99',
-    });
-  }
+    @inject(CoreService)
+    protected readonly coreService: CoreService;
 
-  private async burnBootloader(): Promise<void> {
-    this.clearVisibleNotification();
-    const options = await this.options();
-    try {
-      await this.doWithProgress({
-        progressText: nls.localize(
-          'arduino/bootloader/burningBootloader',
-          'Burning bootloader...'
-        ),
-        task: (progressId, coreService, token) =>
-          coreService.burnBootloader(
-            {
-              ...options,
-              progressId,
-            },
-            token
-          ),
-        cancelable: true,
-      });
-      this.messageService.info(
-        nls.localize(
-          'arduino/bootloader/doneBurningBootloader',
-          'Done burning bootloader.'
-        ),
-        {
-          timeout: 3000,
-        }
-      );
-    } catch (e) {
-      this.handleError(e);
+    @inject(MonitorConnection)
+    protected readonly monitorConnection: MonitorConnection;
+
+    @inject(BoardsDataStore)
+    protected readonly boardsDataStore: BoardsDataStore;
+
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClientImpl: BoardsServiceProvider;
+
+    @inject(OutputChannelManager)
+    protected readonly outputChannelManager: OutputChannelManager;
+
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(BurnBootloader.Commands.BURN_BOOTLOADER, {
+            execute: () => this.burnBootloader()
+        });
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.TOOLS__BOARD_SETTINGS_GROUP, {
+            commandId: BurnBootloader.Commands.BURN_BOOTLOADER.id,
+            label: 'Burn Bootloader',
+            order: 'z99'
+        });
+    }
+
+    async burnBootloader(): Promise<void> {
+        const monitorConfig = this.monitorConnection.monitorConfig;
+        if (monitorConfig) {
+            await this.monitorConnection.disconnect();
+        }
+        try {
+            const { boardsConfig } = this.boardsServiceClientImpl;
+            const port = boardsConfig.selectedPort?.address;
+            const [fqbn, { selectedProgrammer: programmer }, verify, verbose] = await Promise.all([
+                this.boardsDataStore.appendConfigToFqbn(boardsConfig.selectedBoard?.fqbn),
+                this.boardsDataStore.getData(boardsConfig.selectedBoard?.fqbn),
+                this.preferences.get('arduino.upload.verify'),
+                this.preferences.get('arduino.upload.verbose')
+            ]);
+            this.outputChannelManager.getChannel('Arduino').clear();
+            await this.coreService.burnBootloader({
+                fqbn,
+                programmer,
+                port,
+                verify,
+                verbose
+            });
+            this.messageService.info('Done burning bootloader.', { timeout: 1000 });
+        } catch (e) {
+            this.messageService.error(e.toString());
+        } finally {
+            if (monitorConfig) {
+                await this.monitorConnection.connect(monitorConfig);
+            }
+        }
     }
-  }
 
-  private async options(): Promise<CoreService.Options.Bootloader> {
-    const { boardsConfig } = this.boardsServiceProvider;
-    const port = boardsConfig.selectedPort;
-    const [fqbn, { selectedProgrammer: programmer }, verify, verbose] =
-      await Promise.all([
-        this.boardsDataStore.appendConfigToFqbn(
-          boardsConfig.selectedBoard?.fqbn
-        ),
-        this.boardsDataStore.getData(boardsConfig.selectedBoard?.fqbn),
-        this.preferences.get('arduino.upload.verify'),
-        this.preferences.get('arduino.upload.verbose'),
-      ]);
-    return {
-      fqbn,
-      programmer,
-      port,
-      verify,
-      verbose,
-    };
-  }
 }
 
 export namespace BurnBootloader {
-  export namespace Commands {
-    export const BURN_BOOTLOADER: Command = {
-      id: 'arduino-burn-bootloader',
-    };
-  }
+    export namespace Commands {
+        export const BURN_BOOTLOADER: Command = {
+            id: 'arduino-burn-bootloader'
+        };
+    }
 }

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

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

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

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

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

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

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

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

@@ -1,369 +1,118 @@
-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 { inject, injectable, interfaces } from 'inversify';
 import URI from '@theia/core/lib/common/uri';
-import {
-  inject,
-  injectable,
-  interfaces,
-  postConstruct,
-} from '@theia/core/shared/inversify';
-import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
+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 { 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 {
-  CoreError,
-  CoreService,
-  FileSystemExt,
-  ResponseServiceClient,
-  Sketch,
-  SketchesService,
-} from '../../common/protocol';
-import {
-  ExecuteWithProgress,
-  UserAbortApplicationError,
-} from '../../common/protocol/progressible';
+import { MaybePromise } from '@theia/core/lib/common/types';
+import { LabelProvider } from '@theia/core/lib/browser/label-provider';
+import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
+import { MessageService } from '@theia/core/lib/common/message-service';
+import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
+import { open, OpenerService } from '@theia/core/lib/browser/opener-service';
+import { MenuModelRegistry, MenuContribution } from '@theia/core/lib/common/menu';
+import { KeybindingRegistry, KeybindingContribution } from '@theia/core/lib/browser/keybinding';
+import { TabBarToolbarContribution, TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import { FrontendApplicationContribution, FrontendApplication } from '@theia/core/lib/browser/frontend-application';
+import { Command, CommandRegistry, CommandContribution, CommandService } from '@theia/core/lib/common/command';
+import { EditorMode } from '../editor-mode';
+import { SettingsService } from '../settings';
+import { SketchesServiceClientImpl } from '../../common/protocol/sketches-service-client-impl';
+import { SketchesService, ConfigService, FileSystemExt, Sketch } from '../../common/protocol';
 import { ArduinoPreferences } from '../arduino-preferences';
-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 '../sketches-service-client-impl';
-import { ApplicationConnectionStatusContribution } from '../theia/core/connection-status-service';
-import { OutputChannelManager } from '../theia/output/output-channel';
-import { WorkspaceService } from '../theia/workspace/workspace-service';
 
-export {
-  Command,
-  CommandRegistry,
-  KeybindingRegistry,
-  MenuModelRegistry,
-  Sketch,
-  TabBarToolbarRegistry,
-  URI,
-  open,
-};
+export { Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, TabBarToolbarRegistry, URI, Sketch, open };
 
 @injectable()
-export abstract class Contribution
-  implements
-    CommandContribution,
-    MenuContribution,
-    KeybindingContribution,
-    TabBarToolbarContribution,
-    FrontendApplicationContribution
-{
-  @inject(ILogger)
-  protected readonly logger: ILogger;
+export abstract class Contribution implements CommandContribution, MenuContribution, KeybindingContribution, TabBarToolbarContribution, FrontendApplicationContribution {
 
-  @inject(MessageService)
-  protected readonly messageService: MessageService;
+    @inject(ILogger)
+    protected readonly logger: ILogger;
 
-  @inject(CommandService)
-  protected readonly commandService: CommandService;
+    @inject(MessageService)
+    protected readonly messageService: MessageService;
 
-  @inject(WorkspaceService)
-  protected readonly workspaceService: WorkspaceService;
+    @inject(CommandService)
+    protected readonly commandService: CommandService;
 
-  @inject(LabelProvider)
-  protected readonly labelProvider: LabelProvider;
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
 
-  @inject(SettingsService)
-  protected readonly settingsService: SettingsService;
+    @inject(EditorMode)
+    protected readonly editorMode: EditorMode;
 
-  @inject(ArduinoPreferences)
-  protected readonly preferences: ArduinoPreferences;
+    @inject(LabelProvider)
+    protected readonly labelProvider: LabelProvider;
 
-  @inject(FrontendApplicationStateService)
-  protected readonly appStateService: FrontendApplicationStateService;
+    @inject(SettingsService)
+    protected readonly settingsService: SettingsService;
 
-  @inject(MainMenuManager)
-  protected readonly menuManager: MainMenuManager;
+    onStart(app: FrontendApplication): MaybePromise<void> {
+    }
 
-  @inject(DialogService)
-  protected readonly dialogService: DialogService;
+    registerCommands(registry: CommandRegistry): void {
+    }
 
-  @postConstruct()
-  protected init(): void {
-    this.appStateService.reachedState('ready').then(() => this.onReady());
-  }
+    registerMenus(registry: MenuModelRegistry): void {
+    }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function, unused-imports/no-unused-vars
-  onStart(app: FrontendApplication): MaybePromise<void> {}
+    registerKeybindings(registry: KeybindingRegistry): void {
+    }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function, unused-imports/no-unused-vars
-  registerCommands(registry: CommandRegistry): void {}
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+    }
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function, unused-imports/no-unused-vars
-  registerMenus(registry: MenuModelRegistry): void {}
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function, unused-imports/no-unused-vars
-  registerKeybindings(registry: KeybindingRegistry): void {}
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function, unused-imports/no-unused-vars
-  registerToolbarItems(registry: TabBarToolbarRegistry): void {}
-
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  onReady(): MaybePromise<void> {}
 }
 
 @injectable()
 export abstract class SketchContribution extends Contribution {
-  @inject(FileService)
-  protected readonly fileService: FileService;
 
-  @inject(FileSystemExt)
-  protected readonly fileSystemExt: FileSystemExt;
+    @inject(FileService)
+    protected readonly fileService: FileService;
 
-  @inject(ConfigServiceClient)
-  protected readonly configService: ConfigServiceClient;
+    @inject(FileSystemExt)
+    protected readonly fileSystemExt: FileSystemExt;
 
-  @inject(SketchesService)
-  protected readonly sketchesService: SketchesService;
+    @inject(ConfigService)
+    protected readonly configService: ConfigService;
 
-  @inject(OpenerService)
-  protected readonly openerService: OpenerService;
+    @inject(SketchesService)
+    protected readonly sketchService: SketchesService;
 
-  @inject(SketchesServiceClientImpl)
-  protected readonly sketchServiceClient: SketchesServiceClientImpl;
+    @inject(OpenerService)
+    protected readonly openerService: OpenerService;
 
-  @inject(EditorManager)
-  protected readonly editorManager: EditorManager;
+    @inject(SketchesServiceClientImpl)
+    protected readonly sketchServiceClient: SketchesServiceClientImpl;
 
-  @inject(OutputChannelManager)
-  protected readonly outputChannelManager: OutputChannelManager;
+    @inject(ArduinoPreferences)
+    protected readonly preferences: ArduinoPreferences;
 
-  @inject(EnvVariablesServer)
-  protected readonly envVariableServer: EnvVariablesServer;
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
 
-  @inject(ApplicationConnectionStatusContribution)
-  protected readonly connectionStatusService: ApplicationConnectionStatusContribution;
-
-  protected async sourceOverride(): Promise<Record<string, string>> {
-    const override: Record<string, string> = {};
-    const sketch = await this.sketchServiceClient.currentSketch();
-    if (CurrentSketch.isValid(sketch)) {
-      for (const editor of this.editorManager.all) {
-        const uri = editor.editor.uri;
-        if (Saveable.isDirty(editor) && Sketch.isInSketch(uri, sketch)) {
-          override[uri.toString()] = editor.editor.document.getText();
+    protected async sourceOverride(): Promise<Record<string, string>> {
+        const override: Record<string, string> = {};
+        const sketch = await this.sketchServiceClient.currentSketch();
+        if (sketch) {
+            for (const editor of this.editorManager.all) {
+                const uri = editor.editor.uri;
+                if (Saveable.isDirty(editor) && Sketch.isInSketch(uri, sketch)) {
+                    override[uri.toString()] = editor.editor.document.getText();
+                }
+            }
         }
-      }
+        return override;
     }
-    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()
-export abstract class CoreServiceContribution extends SketchContribution {
-  @inject(BoardsDataStore)
-  protected readonly boardsDataStore: BoardsDataStore;
-
-  @inject(BoardsServiceProvider)
-  protected readonly boardsServiceProvider: BoardsServiceProvider;
-
-  @inject(CoreService)
-  private readonly coreService: CoreService;
-
-  @inject(ClipboardService)
-  private readonly clipboardService: ClipboardService;
-
-  @inject(ResponseServiceClient)
-  private readonly responseService: ResponseServiceClient;
-
-  @inject(NotificationManager)
-  private readonly notificationManager: NotificationManager;
-
-  @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);
-  }
-
-  private tryToastErrorMessage(error: unknown): void {
-    let message: undefined | string = undefined;
-    if (CoreError.is(error)) {
-      message = error.message;
-    } else if (error instanceof Error) {
-      message = error.message;
-    } else if (typeof error === 'string') {
-      message = error;
-    } else {
-      try {
-        message = JSON.stringify(error);
-      } catch {}
-    }
-    if (message) {
-      if (message.includes('Missing FQBN (Fully Qualified Board Name)')) {
-        message = nls.localize(
-          'arduino/coreContribution/noBoardSelected',
-          'No board selected. Please select your Arduino board from the Tools > Board menu.'
-        );
-      }
-      const copyAction = nls.localize(
-        'arduino/coreContribution/copyError',
-        'Copy error messages'
-      );
-      this.visibleNotificationId = this.notificationId(message, copyAction);
-      this.messageService.error(message, copyAction).then(async (action) => {
-        if (action === copyAction) {
-          const content = await this.outputChannelManager.contentOfChannel(
-            'Arduino'
-          );
-          if (content) {
-            this.clipboardService.writeText(content);
-          }
-        }
-      });
-    } else {
-      throw error;
-    }
-  }
-
-  protected async doWithProgress<T>(options: {
-    progressText: string;
-    keepOutput?: boolean;
-    task: (
-      progressId: string,
-      coreService: CoreService,
-      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')
-      .show({ preserveFocus: true });
-    const result = await ExecuteWithProgress.doWithProgress({
-      messageService: this.messageService,
-      responseService: this.responseService,
-      progressText,
-      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 {
-  export function configure(
-    bind: interfaces.Bind,
-    serviceIdentifier: typeof Contribution
-  ): void {
-    bind(serviceIdentifier).toSelf().inSingletonScope();
-    bind(CommandContribution).toService(serviceIdentifier);
-    bind(MenuContribution).toService(serviceIdentifier);
-    bind(KeybindingContribution).toService(serviceIdentifier);
-    bind(TabBarToolbarContribution).toService(serviceIdentifier);
-    bind(FrontendApplicationContribution).toService(serviceIdentifier);
-  }
+    export function configure<T>(bind: interfaces.Bind, serviceIdentifier: typeof Contribution): void {
+        bind(serviceIdentifier).toSelf().inSingletonScope();
+        bind(CommandContribution).toService(serviceIdentifier);
+        bind(MenuContribution).toService(serviceIdentifier);
+        bind(KeybindingContribution).toService(serviceIdentifier);
+        bind(TabBarToolbarContribution).toService(serviceIdentifier);
+        bind(FrontendApplicationContribution).toService(serviceIdentifier);
+    }
 }

arduino-ide-extension/src/browser/contributions/core-error-handler.ts

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

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

@@ -1,118 +0,0 @@
-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/daemon.ts

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

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

@@ -1,442 +1,134 @@
-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 { 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 { inject, injectable } from 'inversify';
+import { Event, Emitter } from '@theia/core/lib/common/event';
+import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin';
 import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
-import {
-  Command,
-  CommandRegistry,
-  SketchContribution,
-  TabBarToolbarRegistry,
-  URI,
-} from './contribution';
-
-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>;
-}
+import { NotificationCenter } from '../notification-center';
+import { Board, BoardsService, ExecutableService } from '../../common/protocol';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
+import { URI, Command, CommandRegistry, SketchContribution, TabBarToolbarRegistry } from './contribution';
 
 @injectable()
-export class Debug
-  extends SketchContribution
-  implements DebugDisabledStatusMessageSource
-{
-  @inject(HostedPluginSupport)
-  private readonly hostedPluginSupport: HostedPluginSupport;
-  @inject(NotificationCenter)
-  private readonly notificationCenter: NotificationCenter;
-  @inject(ExecutableService)
-  private readonly executableService: ExecutableService;
-  @inject(BoardsService)
-  private readonly boardService: BoardsService;
-  @inject(BoardsServiceProvider)
-  private readonly boardsServiceProvider: BoardsServiceProvider;
-  @inject(BoardsDataStore)
-  private readonly boardsDataStore: BoardsDataStore;
+export class Debug extends SketchContribution {
 
-  /**
-   * If `undefined`, debugging is enabled. Otherwise, the human-readable reason why it's disabled.
-   */
-  private _message?: string = noBoardSelected; // Initial pessimism.
-  private readonly didChangeMessageEmitter = new Emitter<string | undefined>();
-  readonly onDidChangeMessage = this.didChangeMessageEmitter.event;
+    @inject(HostedPluginSupport)
+    protected hostedPluginSupport: HostedPluginSupport;
 
-  get message(): string | undefined {
-    return this._message;
-  }
-  private set message(message: string | undefined) {
-    this._message = message;
-    this.didChangeMessageEmitter.fire(this._message);
-  }
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
 
-  private readonly debugToolbarItem = {
-    id: Debug.Commands.START_DEBUGGING.id,
-    command: Debug.Commands.START_DEBUGGING.id,
-    tooltip: `${
-      this.message
-        ? nls.localize(
-            'arduino/debug/debugWithMessage',
-            'Debug - {0}',
-            this.message
-          )
-        : Debug.Commands.START_DEBUGGING.label
-    }`,
-    priority: 3,
-    onDidChange: this.onDidChangeMessage as Event<void>,
-  };
+    @inject(ExecutableService)
+    protected readonly executableService: ExecutableService;
 
-  override onStart(): void {
-    this.onDidChangeMessage(
-      () =>
-        (this.debugToolbarItem.tooltip = `${
-          this.message
-            ? nls.localize(
-                'arduino/debug/debugWithMessage',
-                'Debug - {0}',
-                this.message
-              )
-            : Debug.Commands.START_DEBUGGING.label
-        }`)
-    );
-    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();
-      }
-    });
-  }
+    @inject(BoardsService)
+    protected readonly boardService: BoardsService;
 
-  override onReady(): void {
-    this.boardsServiceProvider.ready.then(() => this.updateMessage());
-  }
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceProvider: BoardsServiceProvider;
 
-  override registerCommands(registry: CommandRegistry): void {
-    registry.registerCommand(Debug.Commands.START_DEBUGGING, {
-      execute: () => this.startDebug(),
-      isVisible: (widget) =>
-        ArduinoToolbar.is(widget) && widget.side === 'left',
-      isEnabled: () => !this.message,
-    });
-    registry.registerCommand(Debug.Commands.TOGGLE_OPTIMIZE_FOR_DEBUG, {
-      execute: () => this.toggleCompileForDebug(),
-      isToggled: () => this.compileForDebug,
-    });
-    registry.registerCommand(Debug.Commands.IS_OPTIMIZE_FOR_DEBUG, {
-      execute: () => this.compileForDebug,
-    });
-  }
+    /**
+     * If `undefined`, debugging is enabled. Otherwise, the reason why it's disabled.
+     */
+    protected _disabledMessages?: string = 'No board selected'; // Initial pessimism.
+    protected disabledMessageDidChangeEmitter = new Emitter<string | undefined>();
+    protected onDisabledMessageDidChange = this.disabledMessageDidChangeEmitter.event;
 
-  override registerToolbarItems(registry: TabBarToolbarRegistry): void {
-    registry.registerItem(this.debugToolbarItem);
-  }
-
-  override registerMenus(registry: MenuModelRegistry): void {
-    registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
-      commandId: Debug.Commands.TOGGLE_OPTIMIZE_FOR_DEBUG.id,
-      label: Debug.Commands.TOGGLE_OPTIMIZE_FOR_DEBUG.label,
-      order: '5',
-    });
-  }
-
-  private async 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;
+    protected get disabledMessage(): string | undefined {
+        return this._disabledMessages;
     }
-  }
-
-  private async isDebugEnabled(
-    board: BoardIdentifier | undefined = this.boardsServiceProvider.boardsConfig
-      .selectedBoard
-  ): 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;
+    protected set disabledMessage(message: string | undefined) {
+        this._disabledMessages = message;
+        this.disabledMessageDidChangeEmitter.fire(this._disabledMessages);
     }
-    const params = await this.createStartDebugParams(board);
-    if (!params) {
-      return false;
-    }
-    await this.hostedPluginSupport.didStart;
-    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');
+
+    protected readonly debugToolbarItem = {
+        id: Debug.Commands.START_DEBUGGING.id,
+        command: Debug.Commands.START_DEBUGGING.id,
+        tooltip: `${this.disabledMessage ? `Debug - ${this.disabledMessage}` : 'Start Debugging'}`,
+        priority: 3,
+        onDidChange: this.onDisabledMessageDidChange as Event<void>
+    };
+
+    onStart(): void {
+        this.onDisabledMessageDidChange(() => this.debugToolbarItem.tooltip = `${this.disabledMessage ? `Debug - ${this.disabledMessage}` : 'Start Debugging'}`);
+        const refreshState = async (board: Board | undefined = this.boardsServiceProvider.boardsConfig.selectedBoard) => {
+            if (!board) {
+                this.disabledMessage = 'No board selected';
+                return;
+            }
+            const fqbn = board.fqbn;
+            if (!fqbn) {
+                this.disabledMessage = `Platform is not installed for '${board.name}'`;
+                return;
+            }
+            const details = await this.boardService.getBoardDetails({ fqbn });
+            if (!details) {
+                this.disabledMessage = `Platform is not installed for '${board.name}'`;
+                return;
+            }
+            const { debuggingSupported } = details;
+            if (!debuggingSupported) {
+                this.disabledMessage = `Debugging is not supported by '${board.name}'`;
+            } else {
+                this.disabledMessage = undefined;
+            }
         }
-      } else {
-        this.messageService.error(
-          err instanceof Error ? err.message : String(err)
-        );
-      }
+        this.boardsServiceProvider.onBoardsConfigChanged(({ selectedBoard }) => refreshState(selectedBoard));
+        this.notificationCenter.onPlatformInstalled(() => refreshState());
+        this.notificationCenter.onPlatformUninstalled(() => refreshState());
+        refreshState();
     }
-    return false;
-  }
 
-  private async debug(
-    params: StartDebugParams
-  ): Promise<StartDebugResult | undefined> {
-    return this.commandService.executeCommand<StartDebugResult>(
-      'arduino.debug.start',
-      params
-    );
-  }
-
-  get compileForDebug(): boolean {
-    const value = window.localStorage.getItem(COMPILE_FOR_DEBUG_KEY);
-    return value === 'true';
-  }
-
-  private toggleCompileForDebug(): void {
-    const oldState = this.compileForDebug;
-    const newState = !oldState;
-    window.localStorage.setItem(COMPILE_FOR_DEBUG_KEY, String(newState));
-    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;
-      }
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(Debug.Commands.START_DEBUGGING, {
+            execute: () => this.startDebug(),
+            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
+            isEnabled: () => !this.disabledMessage
+        });
     }
-    return false;
-  }
 
-  private async createStartDebugParams(
-    board: BoardIdentifier | undefined
-  ): Promise<StartDebugParams | undefined> {
-    if (!board || !board.fqbn) {
-      return undefined;
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+        registry.registerItem(this.debugToolbarItem);
     }
-    let debugFqbn: string | undefined = undefined;
-    try {
-      debugFqbn = await this.isDebugEnabled(board);
-    } catch {}
-    if (!debugFqbn) {
-      return undefined;
+
+    protected async startDebug(board: Board | undefined = this.boardsServiceProvider.boardsConfig.selectedBoard): Promise<void> {
+        if (!board) {
+            return;
+        }
+        const { name, fqbn } = board;
+        if (!fqbn) {
+            return;
+        }
+        await this.hostedPluginSupport.didStart;
+        const [sketch, executables] = await Promise.all([
+            this.sketchServiceClient.currentSketch(),
+            this.executableService.list()
+        ]);
+        if (!sketch) {
+            return;
+        }
+        const [cliPath, sketchPath] = await Promise.all([
+            this.fileService.fsPath(new URI(executables.cliUri)),
+            this.fileService.fsPath(new URI(sketch.uri))
+        ])
+        const config = {
+            cliPath,
+            board: {
+                fqbn,
+                name
+            },
+            sketchPath
+        };
+        return this.commandService.executeCommand('arduino.debug.start', config);
     }
-    const [sketch, executables, boardsData] = await Promise.all([
-      this.sketchServiceClient.currentSketch(),
-      this.executableService.list(),
-      this.boardsDataStore.getData(board.fqbn),
-    ]);
-    if (!CurrentSketch.isValid(sketch)) {
-      return undefined;
-    }
-    const ideTempFolderUri = await this.sketchesService.getIdeTempFolderUri(
-      sketch
-    );
-    const [cliPath, sketchPath, launchConfigsDirPath] = await Promise.all([
-      this.fileService.fsPath(new URI(executables.cliUri)),
-      this.fileService.fsPath(new URI(sketch.uri)),
-      this.fileService.fsPath(new URI(ideTempFolderUri)),
-    ]);
-    return {
-      board: { fqbn: debugFqbn, name: board.name },
-      cliPath,
-      sketchPath,
-      launchConfigsDirPath,
-      programmer: boardsData.selectedProgrammer?.id,
-      title: nls.localize(
-        'arduino/debug/getDebugInfo',
-        'Getting debug info...'
-      ),
-    };
-  }
+
 }
+
 export namespace Debug {
-  export namespace Commands {
-    export const START_DEBUGGING = Command.toLocalizedCommand(
-      {
-        id: 'arduino-start-debug',
-        label: 'Start Debugging',
-        category: 'Arduino',
-      },
-      'vscode/debug.contribution/startDebuggingHelp'
-    );
-    export const TOGGLE_OPTIMIZE_FOR_DEBUG = Command.toLocalizedCommand(
-      {
-        id: 'arduino-toggle-optimize-for-debug',
-        label: 'Optimize for Debugging',
-        category: 'Arduino',
-      },
-      'arduino/debug/optimizeForDebugging'
-    );
-    export const IS_OPTIMIZE_FOR_DEBUG: Command = {
-      id: 'arduino-is-optimize-for-debug',
-    };
-  }
-}
-
-/**
- * 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
-  );
+    export namespace Commands {
+        export const START_DEBUGGING: Command = {
+            id: 'arduino-start-debug',
+            label: 'Start Debugging',
+            category: 'Arduino'
+        }
+    }
 }

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

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

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

@@ -1,370 +1,169 @@
-import PQueue from 'p-queue';
-import { inject, injectable } from '@theia/core/shared/inversify';
-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 * as PQueue from 'p-queue';
+import { inject, injectable, postConstruct } from 'inversify';
+import { MenuPath, CompositeMenuNode } from '@theia/core/lib/common/menu';
+import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { OpenSketch } from './open-sketch';
-import {
-  ArduinoMenus,
-  examplesLabel,
-  PlaceholderMenuNode,
-} from '../menu/arduino-menus';
+import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
+import { MainMenuManager } from '../../common/main-menu-manager';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import { ExamplesService } from '../../common/protocol/examples-service';
-import {
-  SketchContribution,
-  CommandRegistry,
-  MenuModelRegistry,
-} from './contribution';
+import { ExamplesService, ExampleContainer } from '../../common/protocol/examples-service';
+import { SketchContribution, CommandRegistry, MenuModelRegistry } from './contribution';
 import { NotificationCenter } from '../notification-center';
-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;
-  }
-}
+import { Board } from '../../common/protocol';
 
 @injectable()
 export abstract class Examples extends SketchContribution {
-  @inject(CommandRegistry)
-  private readonly commandRegistry: CommandRegistry;
 
-  @inject(MenuModelRegistry)
-  protected readonly menuRegistry: MenuModelRegistry;
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
 
-  @inject(ExamplesService)
-  protected readonly examplesService: ExamplesService;
+    @inject(MenuModelRegistry)
+    protected readonly menuRegistry: MenuModelRegistry;
 
-  @inject(CoreService)
-  protected readonly coreService: CoreService;
+    @inject(MainMenuManager)
+    protected readonly menuManager: MainMenuManager;
 
-  @inject(BoardsServiceProvider)
-  protected readonly boardsServiceProvider: BoardsServiceProvider;
+    @inject(ExamplesService)
+    protected readonly examplesService: ExamplesService;
 
-  @inject(NotificationCenter)
-  protected readonly notificationCenter: NotificationCenter;
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClient: BoardsServiceProvider;
 
-  protected readonly toDispose = new DisposableCollection();
+    protected readonly toDispose = new DisposableCollection();
 
-  protected override init(): void {
-    super.init();
-    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 {
-    // 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,
-      examplesLabel,
-      {
-        order: '4',
-      }
-    );
-  }
-
-  registerRecursively(
-    sketchContainerOrPlaceholder:
-      | SketchContainer
-      | (SketchRef | SketchContainer)[]
-      | string,
-    menuPath: MenuPath,
-    pushToDispose: DisposableCollection = new DisposableCollection(),
-    subMenuOptions?: SubMenuOptions | undefined
-  ): void {
-    if (typeof sketchContainerOrPlaceholder === 'string') {
-      const placeholder = new PlaceholderMenuNode(
-        menuPath,
-        sketchContainerOrPlaceholder
-      );
-      this.menuRegistry.registerMenuNode(menuPath, placeholder);
-      pushToDispose.push(
-        Disposable.create(() =>
-          this.menuRegistry.unregisterMenuNode(placeholder.id)
-        )
-      );
-    } else {
-      const sketches: SketchRef[] = [];
-      const children: SketchContainer[] = [];
-      let submenuPath = menuPath;
-
-      if (SketchContainer.is(sketchContainerOrPlaceholder)) {
-        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 {
-        for (const sketchOrContainer of sketchContainerOrPlaceholder) {
-          if (SketchContainer.is(sketchOrContainer)) {
-            children.push(sketchOrContainer);
-          } else {
-            sketches.push(sketchOrContainer);
-          }
-        }
-      }
-      children.forEach((child) =>
-        this.registerRecursively(child, submenuPath, pushToDispose)
-      );
-      for (const sketch of sketches) {
-        const { uri } = sketch;
-        const commandId = `arduino-open-example-${submenuPath.join(
-          ':'
-        )}--${uri}`;
-        const command = { id: commandId };
-        const handler = this.createHandler(uri);
-        pushToDispose.push(
-          this.commandRegistry.registerCommand(command, handler)
-        );
-        this.menuRegistry.registerMenuAction(submenuPath, {
-          commandId,
-          label: sketch.name,
-          order: sketch.name.toLocaleLowerCase(),
-        });
-        pushToDispose.push(
-          Disposable.create(() =>
-            this.menuRegistry.unregisterMenuAction(command)
-          )
-        );
-      }
+    @postConstruct()
+    init(): void {
+        this.boardsServiceClient.onBoardsConfigChanged(({ selectedBoard }) => this.handleBoardChanged(selectedBoard));
+    }
+
+    protected handleBoardChanged(board: Board | undefined): void {
+        // NOOP
+    }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        try {
+            // This is a hack the ensures the desired menu ordering! We cannot use https://github.com/eclipse-theia/theia/pull/8377 due to ATL-222.
+            const index = ArduinoMenus.FILE__EXAMPLES_SUBMENU.length - 1;
+            const menuId = ArduinoMenus.FILE__EXAMPLES_SUBMENU[index];
+            const groupPath = index === 0 ? [] : ArduinoMenus.FILE__EXAMPLES_SUBMENU.slice(0, index);
+            const parent: CompositeMenuNode = (registry as any).findGroup(groupPath);
+            const examples = new CompositeMenuNode(menuId, '', { order: '4' });
+            parent.addNode(examples);
+        } catch (e) {
+            console.error(e);
+            console.warn('Could not patch menu ordering.');
+        }
+        // Registering the same submenu multiple times has no side-effect.
+        // TODO: unregister submenu? https://github.com/eclipse-theia/theia/issues/7300
+        registry.registerSubmenu(ArduinoMenus.FILE__EXAMPLES_SUBMENU, 'Examples', { order: '4' });
+    }
+
+    registerRecursively(
+        exampleContainerOrPlaceholder: ExampleContainer | string,
+        menuPath: MenuPath,
+        pushToDispose: DisposableCollection = new DisposableCollection()): void {
+
+        if (typeof exampleContainerOrPlaceholder === 'string') {
+            const placeholder = new PlaceholderMenuNode(menuPath, exampleContainerOrPlaceholder);
+            this.menuRegistry.registerMenuNode(menuPath, placeholder);
+            pushToDispose.push(Disposable.create(() => this.menuRegistry.unregisterMenuNode(placeholder.id)));
+        } else {
+            const { label, sketches, children } = exampleContainerOrPlaceholder;
+            const submenuPath = [...menuPath, label];
+            this.menuRegistry.registerSubmenu(submenuPath, label);
+            children.forEach(child => this.registerRecursively(child, submenuPath, pushToDispose));
+            for (const sketch of sketches) {
+                const { uri } = sketch;
+                const commandId = `arduino-open-example-${submenuPath.join(':')}--${uri}`;
+                const command = { id: commandId };
+                const handler = {
+                    execute: async () => {
+                        const sketch = await this.sketchService.cloneExample(uri);
+                        this.commandService.executeCommand(OpenSketch.Commands.OPEN_SKETCH.id, sketch);
+                    }
+                };
+                pushToDispose.push(this.commandRegistry.registerCommand(command, handler));
+                this.menuRegistry.registerMenuAction(submenuPath, { commandId, label: sketch.name });
+                pushToDispose.push(Disposable.create(() => this.menuRegistry.unregisterMenuAction(command)));
+            }
+        }
     }
-  }
 
-  protected createHandler(uri: string): CommandHandler {
-    const forceUpdate = () =>
-      this.update({
-        board: this.boardsServiceProvider.boardsConfig.selectedBoard,
-        forceRefresh: true,
-      });
-    return {
-      execute: async () => {
-        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();
-            },
-          }
-        );
-      },
-    };
-  }
 }
 
 @injectable()
 export class BuiltInExamples extends Examples {
-  override async onReady(): Promise<void> {
-    this.update(); // no `await`
-  }
 
-  protected override async update(): Promise<void> {
-    let sketchContainers: SketchContainer[] | undefined;
-    try {
-      sketchContainers = await this.examplesService.builtIns();
-    } catch (e) {
-      console.error('Could not initialize built-in examples.', e);
-      this.messageService.error(
-        nls.localize(
-          'arduino/examples/couldNotInitializeExamples',
-          'Could not initialize built-in examples.'
-        )
-      );
-      return;
+    onStart(): void {
+        this.register(); // no `await`
     }
-    this.toDispose.dispose();
-    for (const container of [
-      nls.localize('arduino/examples/builtInExamples', 'Built-in examples'),
-      ...sketchContainers,
-    ]) {
-      this.registerRecursively(
-        container,
-        ArduinoMenus.EXAMPLES__BUILT_IN_GROUP,
-        this.toDispose
-      );
+
+    protected async register() {
+        let exampleContainers: ExampleContainer[] | undefined;
+        try {
+            exampleContainers = await this.examplesService.builtIns();
+        } catch (e) {
+            console.error('Could not initialize built-in examples.', e);
+            this.messageService.error('Could not initialize built-in examples.');
+            return;
+        }
+        this.toDispose.dispose();
+        for (const container of ['Built-in examples', ...exampleContainers]) {
+            this.registerRecursively(container, ArduinoMenus.EXAMPLES__BUILT_IN_GROUP, this.toDispose);
+        }
+        this.menuManager.update();
+        // TODO: remove
+        console.log(typeof this.menuRegistry);
     }
-    this.menuManager.update();
-  }
+
 }
 
 @injectable()
 export class LibraryExamples extends Examples {
-  private readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
 
-  override onStart(): void {
-    this.notificationCenter.onLibraryDidInstall(() => this.update());
-    this.notificationCenter.onLibraryDidUninstall(() => this.update());
-  }
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
 
-  override onReady(): void {
-    this.boardsServiceProvider.ready.then(() => this.update());
-  }
+    protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
 
-  protected override handleBoardChanged(board: Board | undefined): void {
-    this.update({ board });
-  }
-
-  protected override async update(
-    options: { board?: Board; forceRefresh?: boolean } = {
-      board: this.boardsServiceProvider.boardsConfig.selectedBoard,
+    onStart(): void {
+        this.register(); // no `await`
+        this.notificationCenter.onLibraryInstalled(() => this.register());
+        this.notificationCenter.onLibraryUninstalled(() => this.register());
     }
-  ): Promise<void> {
-    const { board, forceRefresh } = options;
-    return this.queue.add(async () => {
-      this.toDispose.dispose();
-      if (forceRefresh) {
-        await this.coreService.refresh();
-      }
-      const fqbn = board?.fqbn;
-      const name = board?.name;
-      // Shows all examples when no board is selected, or the platform of the currently selected board is not installed.
-      const { user, current, any } = await this.examplesService.installed({
-        fqbn,
-      });
-      if (user.length) {
-        (user as any).unshift(
-          nls.localize(
-            'arduino/examples/customLibrary',
-            'Examples from Custom Libraries'
-          )
-        );
-      }
-      if (name && fqbn && current.length) {
-        (current as any).unshift(
-          nls.localize('arduino/examples/for', 'Examples for {0}', name)
-        );
-      }
-      if (any.length) {
-        (any as any).unshift(
-          nls.localize('arduino/examples/forAny', 'Examples for any board')
-        );
-      }
-      for (const container of user) {
-        this.registerRecursively(
-          container,
-          ArduinoMenus.EXAMPLES__USER_LIBS_GROUP,
-          this.toDispose
-        );
-      }
-      for (const container of current) {
-        this.registerRecursively(
-          container,
-          ArduinoMenus.EXAMPLES__CURRENT_BOARD_GROUP,
-          this.toDispose
-        );
-      }
-      for (const container of any) {
-        this.registerRecursively(
-          container,
-          ArduinoMenus.EXAMPLES__ANY_BOARD_GROUP,
-          this.toDispose
-        );
-      }
-      this.menuManager.update();
-    });
-  }
+
+    protected handleBoardChanged(board: Board | undefined): void {
+        this.register(board);
+    }
+
+    protected async register(board: Board | undefined = this.boardsServiceClient.boardsConfig.selectedBoard) {
+        return this.queue.add(async () => {
+            this.toDispose.dispose();
+            if (!board || !board.fqbn) {
+                return;
+            }
+            const { fqbn, name } = board;
+            const { user, current, any } = await this.examplesService.installed({ fqbn });
+            if (user.length) {
+                (user as any).unshift('Examples from Custom Libraries');
+            }
+            if (current.length) {
+                (current as any).unshift(`Examples for ${name}`);
+            }
+            if (any.length) {
+                (any as any).unshift('Examples for any board');
+            }
+            for (const container of user) {
+                this.registerRecursively(container, ArduinoMenus.EXAMPLES__USER_LIBS_GROUP, this.toDispose);
+            }
+            for (const container of current) {
+                this.registerRecursively(container, ArduinoMenus.EXAMPLES__CURRENT_BOARD_GROUP, this.toDispose);
+            }
+            for (const container of any) {
+                this.registerRecursively(container, ArduinoMenus.EXAMPLES__ANY_BOARD_GROUP, this.toDispose);
+            }
+            this.menuManager.update();
+        });
+    }
+
 }

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

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

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

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

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

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

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

@@ -1,12 +1,10 @@
-import PQueue from 'p-queue';
-import { inject, injectable } from '@theia/core/shared/inversify';
+import * as PQueue from 'p-queue';
+import { inject, injectable } from 'inversify';
 import URI from '@theia/core/lib/common/uri';
 import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor';
+import { EditorManager } from '@theia/editor/lib/browser';
 import { MenuModelRegistry, MenuPath } from '@theia/core/lib/common/menu';
-import {
-  Disposable,
-  DisposableCollection,
-} from '@theia/core/lib/common/disposable';
+import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
 import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
 import { LibraryPackage, LibraryService } from '../../common/protocol';
 import { MainMenuManager } from '../../common/main-menu-manager';
@@ -14,219 +12,164 @@ import { LibraryListWidget } from '../library/library-list-widget';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
 import { SketchContribution, Command, CommandRegistry } from './contribution';
 import { NotificationCenter } from '../notification-center';
-import { nls } from '@theia/core/lib/common';
-import * as monaco from '@theia/monaco-editor-core';
-import { CurrentSketch } from '../sketches-service-client-impl';
 
 @injectable()
 export class IncludeLibrary extends SketchContribution {
-  @inject(CommandRegistry)
-  private readonly commandRegistry: CommandRegistry;
 
-  @inject(MenuModelRegistry)
-  private readonly menuRegistry: MenuModelRegistry;
+    @inject(CommandRegistry)
+    protected readonly commandRegistry: CommandRegistry;
 
-  @inject(MainMenuManager)
-  private readonly mainMenuManager: MainMenuManager;
+    @inject(MenuModelRegistry)
+    protected readonly menuRegistry: MenuModelRegistry;
 
-  @inject(NotificationCenter)
-  private readonly notificationCenter: NotificationCenter;
+    @inject(MainMenuManager)
+    protected readonly mainMenuManager: MainMenuManager;
 
-  @inject(BoardsServiceProvider)
-  private readonly boardsServiceProvider: BoardsServiceProvider;
+    @inject(EditorManager)
+    protected readonly editorManager: EditorManager;
 
-  @inject(LibraryService)
-  private readonly libraryService: LibraryService;
+    @inject(NotificationCenter)
+    protected readonly notificationCenter: NotificationCenter;
 
-  private readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
-  private readonly toDispose = new DisposableCollection();
+    @inject(BoardsServiceProvider)
+    protected readonly boardsServiceClient: BoardsServiceProvider;
 
-  override onStart(): void {
-    this.boardsServiceProvider.onBoardsConfigDidChange(() =>
-      this.updateMenuActions()
-    );
-    this.notificationCenter.onLibraryDidInstall(() => this.updateMenuActions());
-    this.notificationCenter.onLibraryDidUninstall(() =>
-      this.updateMenuActions()
-    );
-    this.notificationCenter.onDidReinitialize(() => this.updateMenuActions());
-  }
+    @inject(LibraryService)
+    protected readonly libraryService: LibraryService;
 
-  override onReady(): void {
-    this.boardsServiceProvider.ready.then(() => this.updateMenuActions());
-  }
+    protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
+    protected readonly toDispose = new DisposableCollection();
 
-  override registerMenus(registry: MenuModelRegistry): void {
-    // `Include Library` submenu
-    const includeLibMenuPath = [
-      ...ArduinoMenus.SKETCH__UTILS_GROUP,
-      '0_include',
-    ];
-    registry.registerSubmenu(
-      includeLibMenuPath,
-      nls.localize('arduino/library/include', 'Include Library'),
-      {
-        order: '1',
-      }
-    );
-    // `Manage Libraries...` group.
-    registry.registerMenuAction([...includeLibMenuPath, '0_manage'], {
-      commandId: `${LibraryListWidget.WIDGET_ID}:toggle`,
-      label: nls.localize(
-        'arduino/library/manageLibraries',
-        'Manage Libraries...'
-      ),
-    });
-  }
+    onStart(): void {
+        this.updateMenuActions();
+        this.boardsServiceClient.onBoardsConfigChanged(() => this.updateMenuActions())
+        this.notificationCenter.onLibraryInstalled(() => this.updateMenuActions());
+        this.notificationCenter.onLibraryUninstalled(() => this.updateMenuActions());
+    }
 
-  override registerCommands(registry: CommandRegistry): void {
-    registry.registerCommand(IncludeLibrary.Commands.INCLUDE_LIBRARY, {
-      execute: async (arg) => {
-        if (LibraryPackage.is(arg)) {
-          this.includeLibrary(arg);
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(IncludeLibrary.Commands.INCLUDE_LIBRARY, {
+            execute: async arg => {
+                if (LibraryPackage.is(arg)) {
+                    this.includeLibrary(arg);
+                }
+            }
+        });
+    }
+
+    protected async updateMenuActions(): Promise<void> {
+        return this.queue.add(async () => {
+            this.toDispose.dispose();
+            this.mainMenuManager.update();
+            const libraries: LibraryPackage[] = []
+            const fqbn = this.boardsServiceClient.boardsConfig.selectedBoard?.fqbn;
+            // Do not show board specific examples, when no board is selected.
+            if (fqbn) {
+                libraries.push(...await this.libraryService.list({ fqbn }));
+            }
+
+            // `Include Library` submenu
+            const includeLibMenuPath = [...ArduinoMenus.SKETCH__UTILS_GROUP, '0_include'];
+            this.menuRegistry.registerSubmenu(includeLibMenuPath, 'Include Library', { order: '1' });
+            // `Manage Libraries...` group.
+            this.menuRegistry.registerMenuAction([...includeLibMenuPath, '0_manage'], {
+                commandId: `${LibraryListWidget.WIDGET_ID}:toggle`,
+                label: 'Manage Libraries...'
+            });
+            this.toDispose.push(Disposable.create(() => this.menuRegistry.unregisterMenuAction({ commandId: `${LibraryListWidget.WIDGET_ID}:toggle` })));
+
+            // `Add .ZIP Library...`
+            // TODO: implement it
+
+            // `Arduino libraries`
+            const packageMenuPath = [...includeLibMenuPath, '2_arduino'];
+            const userMenuPath = [...includeLibMenuPath, '3_contributed'];
+            const { user, rest } = LibraryPackage.groupByLocation(libraries);
+            if (rest.length) {
+                (rest as any).unshift('Arduino libraries');
+            }
+            if (user.length) {
+                (user as any).unshift('Contributed libraries');
+            }
+
+            for (const library of user) {
+                this.toDispose.push(this.registerLibrary(library, userMenuPath));
+            }
+            for (const library of rest) {
+                this.toDispose.push(this.registerLibrary(library, packageMenuPath));
+            }
+
+            this.mainMenuManager.update();
+        });
+    }
+
+    protected registerLibrary(libraryOrPlaceholder: LibraryPackage | string, menuPath: MenuPath): Disposable {
+        if (typeof libraryOrPlaceholder === 'string') {
+            const placeholder = new PlaceholderMenuNode(menuPath, libraryOrPlaceholder);
+            this.menuRegistry.registerMenuNode(menuPath, placeholder);
+            return Disposable.create(() => this.menuRegistry.unregisterMenuNode(placeholder.id));
         }
-      },
-    });
-  }
-
-  private async updateMenuActions(): Promise<void> {
-    return this.queue.add(async () => {
-      this.toDispose.dispose();
-      this.mainMenuManager.update();
-      const libraries: LibraryPackage[] = [];
-      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 })));
-
-      const includeLibMenuPath = [
-        ...ArduinoMenus.SKETCH__UTILS_GROUP,
-        '0_include',
-      ];
-      // `Add .ZIP Library...`
-      // TODO: implement it
-
-      // `Arduino libraries`
-      const packageMenuPath = [...includeLibMenuPath, '2_arduino'];
-      const userMenuPath = [...includeLibMenuPath, '3_contributed'];
-      const { user, rest } = LibraryPackage.groupByLocation(libraries);
-      if (rest.length) {
-        (rest as any).unshift(
-          nls.localize('arduino/library/arduinoLibraries', 'Arduino libraries')
+        const commandId = `arduino-include-library--${libraryOrPlaceholder.name}:${libraryOrPlaceholder.author}`;
+        const command = { id: commandId };
+        const handler = { execute: () => this.commandRegistry.executeCommand(IncludeLibrary.Commands.INCLUDE_LIBRARY.id, libraryOrPlaceholder) };
+        const menuAction = { commandId, label: libraryOrPlaceholder.name };
+        this.menuRegistry.registerMenuAction(menuPath, menuAction);
+        return new DisposableCollection(
+            this.commandRegistry.registerCommand(command, handler),
+            Disposable.create(() => this.menuRegistry.unregisterMenuAction(menuAction)),
         );
-      }
-      if (user.length) {
-        (user as any).unshift(
-          nls.localize(
-            'arduino/library/contributedLibraries',
-            'Contributed libraries'
-          )
-        );
-      }
-
-      for (const library of user) {
-        this.toDispose.push(this.registerLibrary(library, userMenuPath));
-      }
-      for (const library of rest) {
-        this.toDispose.push(this.registerLibrary(library, packageMenuPath));
-      }
-
-      this.mainMenuManager.update();
-    });
-  }
-
-  private registerLibrary(
-    libraryOrPlaceholder: LibraryPackage | string,
-    menuPath: MenuPath
-  ): Disposable {
-    if (typeof libraryOrPlaceholder === 'string') {
-      const placeholder = new PlaceholderMenuNode(
-        menuPath,
-        libraryOrPlaceholder
-      );
-      this.menuRegistry.registerMenuNode(menuPath, placeholder);
-      return Disposable.create(() =>
-        this.menuRegistry.unregisterMenuNode(placeholder.id)
-      );
-    }
-    const commandId = `arduino-include-library--${libraryOrPlaceholder.name}:${libraryOrPlaceholder.author}`;
-    const command = { id: commandId };
-    const handler = {
-      execute: () =>
-        this.commandRegistry.executeCommand(
-          IncludeLibrary.Commands.INCLUDE_LIBRARY.id,
-          libraryOrPlaceholder
-        ),
-    };
-    const menuAction = { commandId, label: libraryOrPlaceholder.name };
-    this.menuRegistry.registerMenuAction(menuPath, menuAction);
-    return new DisposableCollection(
-      this.commandRegistry.registerCommand(command, handler),
-      Disposable.create(() =>
-        this.menuRegistry.unregisterMenuAction(menuAction)
-      )
-    );
-  }
-
-  private async includeLibrary(library: LibraryPackage): Promise<void> {
-    const sketch = await this.sketchServiceClient.currentSketch();
-    if (!CurrentSketch.isValid(sketch)) {
-      return;
-    }
-    // If the current editor is one of the additional files from the sketch, we use that.
-    // Otherwise, we pick the editor of the main sketch file.
-    let codeEditor: monaco.editor.IStandaloneCodeEditor | undefined;
-    const editor = this.editorManager.currentEditor?.editor;
-    if (editor instanceof MonacoEditor) {
-      if (
-        sketch.additionalFileUris.some((uri) => uri === editor.uri.toString())
-      ) {
-        codeEditor = editor.getControl();
-      }
     }
 
-    if (!codeEditor) {
-      const widget = await this.editorManager.open(new URI(sketch.mainFileUri));
-      if (widget.editor instanceof MonacoEditor) {
-        codeEditor = widget.editor.getControl();
-      }
+    protected async includeLibrary(library: LibraryPackage): Promise<void> {
+        const sketch = await this.sketchServiceClient.currentSketch();
+        if (!sketch) {
+            return;
+        }
+        // If the current editor is one of the additional files from the sketch, we use that.
+        // Otherwise, we pick the editor of the main sketch file.
+        let codeEditor: monaco.editor.IStandaloneCodeEditor | undefined;
+        const editor = this.editorManager.currentEditor?.editor;
+        if (editor instanceof MonacoEditor) {
+            if (sketch.additionalFileUris.some(uri => uri === editor.uri.toString())) {
+                codeEditor = editor.getControl();
+            }
+        }
+
+        if (!codeEditor) {
+            const widget = await this.editorManager.open(new URI(sketch.mainFileUri));
+            if (widget.editor instanceof MonacoEditor) {
+                codeEditor = widget.editor.getControl();
+            }
+        }
+
+        if (!codeEditor) {
+            return;
+        }
+
+        const textModel = codeEditor.getModel();
+        if (!textModel) {
+            return;
+        }
+        const cursorState = codeEditor.getSelections() || [];
+        const eol = textModel.getEOL();
+        const includes = library.includes.slice();
+        includes.push(''); // For the trailing new line.
+        const text = includes.map(include => include ? `#include <${include}>` : eol).join(eol);
+        textModel.pushStackElement(); // Start a fresh operation.
+        textModel.pushEditOperations(cursorState, [{
+            range: new monaco.Range(1, 1, 1, 1),
+            text,
+            forceMoveMarkers: true
+        }], () => cursorState);
+        textModel.pushStackElement(); // Make it undoable.
     }
 
-    if (!codeEditor) {
-      return;
-    }
-
-    const textModel = codeEditor.getModel();
-    if (!textModel) {
-      return;
-    }
-    const cursorState = codeEditor.getSelections() || [];
-    const eol = textModel.getEOL();
-    const includes = library.includes.slice();
-    includes.push(''); // For the trailing new line.
-    const text = includes
-      .map((include) => (include ? `#include <${include}>` : eol))
-      .join(eol);
-    textModel.pushStackElement(); // Start a fresh operation.
-    textModel.pushEditOperations(
-      cursorState,
-      [
-        {
-          range: new monaco.Range(1, 1, 1, 1),
-          text,
-          forceMoveMarkers: true,
-        },
-      ],
-      () => cursorState
-    );
-    textModel.pushStackElement(); // Make it undoable.
-  }
 }
 
 export namespace IncludeLibrary {
-  export namespace Commands {
-    export const INCLUDE_LIBRARY: Command = {
-      id: 'arduino-include-library',
-    };
-  }
+    export namespace Commands {
+        export const INCLUDE_LIBRARY: Command = {
+            id: 'arduino-include-library'
+        };
+    }
 }

arduino-ide-extension/src/browser/contributions/indexes-update-progress.ts

@@ -1,71 +0,0 @@
-import { Progress } from '@theia/core/lib/common/message-service-protocol';
-import { ProgressService } from '@theia/core/lib/common/progress-service';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { ProgressMessage } from '../../common/protocol';
-import { NotificationCenter } from '../notification-center';
-import { Contribution } from './contribution';
-
-@injectable()
-export class IndexesUpdateProgress extends Contribution {
-  @inject(NotificationCenter)
-  private readonly notificationCenter: NotificationCenter;
-  @inject(ProgressService)
-  private readonly progressService: ProgressService;
-  private currentProgress:
-    | (Progress & Readonly<{ progressId: string }>)
-    | undefined;
-
-  override onStart(): void {
-    this.notificationCenter.onIndexUpdateWillStart(({ progressId }) =>
-      this.getOrCreateProgress(progressId)
-    );
-    this.notificationCenter.onIndexUpdateDidProgress((progress) => {
-      this.getOrCreateProgress(progress).then((delegate) =>
-        delegate.report(progress)
-      );
-    });
-    this.notificationCenter.onIndexUpdateDidComplete(({ progressId }) => {
-      this.cancelProgress(progressId);
-    });
-    this.notificationCenter.onIndexUpdateDidFail(({ progressId, message }) => {
-      this.cancelProgress(progressId);
-      this.messageService.error(message);
-    });
-  }
-
-  private async getOrCreateProgress(
-    progressOrId: ProgressMessage | string
-  ): Promise<Progress & { progressId: string }> {
-    const progressId = ProgressMessage.is(progressOrId)
-      ? progressOrId.progressId
-      : progressOrId;
-    if (this.currentProgress?.progressId === progressId) {
-      return this.currentProgress;
-    }
-    if (this.currentProgress) {
-      this.currentProgress.cancel();
-    }
-    this.currentProgress = undefined;
-    const progress = await this.progressService.showProgress({
-      text: '',
-      options: { location: 'notification' },
-    });
-    if (ProgressMessage.is(progressOrId)) {
-      progress.report(progressOrId);
-    }
-    this.currentProgress = { ...progress, progressId };
-    return this.currentProgress;
-  }
-
-  private cancelProgress(progressId: string) {
-    if (this.currentProgress) {
-      if (this.currentProgress.progressId !== progressId) {
-        console.warn(
-          `Mismatching progress IDs. Expected ${progressId}, got ${this.currentProgress.progressId}. Canceling anyway.`
-        );
-      }
-      this.currentProgress.cancel();
-      this.currentProgress = undefined;
-    }
-  }
-}

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

@@ -1,359 +0,0 @@
-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 {
-  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;
-
-  override onReady(): void {
-    const start = (
-      selectedBoard: BoardIdentifier | undefined,
-      forceStart = false
-    ) => {
-      if (selectedBoard) {
-        const { name, fqbn } = selectedBoard;
-        if (fqbn) {
-          this.startLanguageServer(fqbn, name, forceStart);
-        }
-      }
-    };
-    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();
-            }
-          }
-        }
-      ),
-      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(
-    fqbn: string,
-    name: string | undefined,
-    forceStart = false
-  ): Promise<void> {
-    const port = await this.daemon.tryGetPort();
-    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 });
-      if (!details) {
-        // Core is not installed for the selected board.
-        console.info(
-          `Could not start language server for ${fqbn}. The core is not installed for the board.`
-        );
-        if (this.languageServerFqbn) {
-          try {
-            await this.commandService.executeCommand(
-              'arduino.languageserver.stop'
-            );
-            console.info(
-              `Stopped language server process for ${this.languageServerFqbn}.`
-            );
-            this.languageServerFqbn = undefined;
-          } catch (e) {
-            console.error(
-              `Failed to start language server process for ${this.languageServerFqbn}`,
-              e
-            );
-            throw e;
-          }
-        }
-        return;
-      }
-      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;
-      }
-      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();
-        if (CurrentSketch.isValid(currentSketch)) {
-          currentSketchPath = await this.fileService.fsPath(
-            new URI(currentSketch.uri)
-          );
-        }
-      }
-      const { clangdUri, lsUri } = await this.executableService.list();
-      const [clangdPath, lsPath] = await Promise.all([
-        this.fileService.fsPath(new URI(clangdUri)),
-        this.fileService.fsPath(new URI(lsUri)),
-      ]);
-
-      this.languageServerFqbn = await Promise.race([
-        new Promise<undefined>((_, reject) => {
-          const timer = setTimeout(
-            () => reject(new Error(`Timeout after ${20_000} ms.`)),
-            20_000
-          );
-          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. 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

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

@@ -1,204 +0,0 @@
-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,52 +1,63 @@
-import { nls } from '@theia/core/lib/common';
-import { injectable } from '@theia/core/shared/inversify';
+import { injectable } from 'inversify';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import {
-  SketchContribution,
-  URI,
-  Command,
-  CommandRegistry,
-  MenuModelRegistry,
-  KeybindingRegistry,
-} from './contribution';
+import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
+import { SketchContribution, URI, Command, CommandRegistry, MenuModelRegistry, KeybindingRegistry, TabBarToolbarRegistry } from './contribution';
 
 @injectable()
 export class NewSketch extends SketchContribution {
-  override registerCommands(registry: CommandRegistry): void {
-    registry.registerCommand(NewSketch.Commands.NEW_SKETCH, {
-      execute: () => this.newSketch(),
-    });
-  }
 
-  override registerMenus(registry: MenuModelRegistry): void {
-    registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
-      commandId: NewSketch.Commands.NEW_SKETCH.id,
-      label: nls.localize('arduino/sketch/new', 'New Sketch'),
-      order: '0',
-    });
-  }
-
-  override registerKeybindings(registry: KeybindingRegistry): void {
-    registry.registerKeybinding({
-      command: NewSketch.Commands.NEW_SKETCH.id,
-      keybinding: 'CtrlCmd+N',
-    });
-  }
-
-  async newSketch(): Promise<void> {
-    try {
-      const sketch = await this.sketchesService.createNewSketch();
-      this.workspaceService.open(new URI(sketch.uri));
-    } catch (e) {
-      await this.messageService.error(e.toString());
+    registerCommands(registry: CommandRegistry): void {
+        registry.registerCommand(NewSketch.Commands.NEW_SKETCH, {
+            execute: () => this.newSketch()
+        });
+        registry.registerCommand(NewSketch.Commands.NEW_SKETCH__TOOLBAR, {
+            isVisible: widget => ArduinoToolbar.is(widget) && widget.side === 'left',
+            execute: () => registry.executeCommand(NewSketch.Commands.NEW_SKETCH.id)
+        });
     }
-  }
+
+    registerMenus(registry: MenuModelRegistry): void {
+        registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
+            commandId: NewSketch.Commands.NEW_SKETCH.id,
+            label: 'New',
+            order: '0'
+        });
+    }
+
+    registerKeybindings(registry: KeybindingRegistry): void {
+        registry.registerKeybinding({
+            command: NewSketch.Commands.NEW_SKETCH.id,
+            keybinding: 'CtrlCmd+N'
+        });
+    }
+
+    registerToolbarItems(registry: TabBarToolbarRegistry): void {
+        registry.registerItem({
+            id: NewSketch.Commands.NEW_SKETCH__TOOLBAR.id,
+            command: NewSketch.Commands.NEW_SKETCH__TOOLBAR.id,
+            tooltip: 'New',
+            priority: 3
+        });
+    }
+
+    async newSketch(): Promise<void> {
+        try {
+            const sketch = await this.sketchService.createNewSketch();
+            this.workspaceService.open(new URI(sketch.uri));
+        } catch (e) {
+            await this.messageService.error(e.toString());
+        }
+    }
+
 }
 
 export namespace NewSketch {
-  export namespace Commands {
-    export const NEW_SKETCH: Command = {
-      id: 'arduino-new-sketch',
-    };
-  }
+    export namespace Commands {
+        export const NEW_SKETCH: Command = {
+            id: 'arduino-new-sketch'
+        };
+        export const NEW_SKETCH__TOOLBAR: Command = {
+            id: 'arduino-new-sketch--toolbar'
+        };
+    }
 }

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

@@ -1,25 +0,0 @@
-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 { Contribution } from './contribution';
-
-@injectable()
-export class OpenBoardsConfig extends Contribution {
-  @inject(BoardsConfigDialog)
-  private readonly boardsConfigDialog: BoardsConfigDialog;
-
-  override registerCommands(registry: CommandRegistry): void {
-    registry.registerCommand(OpenBoardsConfig.Commands.OPEN_DIALOG, {
-      execute: async (params?: EditBoardsConfigActionParams) =>
-        this.boardsConfigDialog.open(true, params),
-    });
-  }
-}
-export namespace OpenBoardsConfig {
-  export namespace Commands {
-    export const OPEN_DIALOG: Command = {
-      id: 'arduino-open-boards-dialog',
-    };
-  }
-}