change MonitorService providers to injectable deps

.eslintrc.js

@@ -15,7 +15,9 @@ module.exports = {
         '.browser_modules/*',
         'docs/*',
         'scripts/*',
+        'electron/*',
         'electron-app/*',
+        'browser-app/*',
         'plugins/*',
         'arduino-ide-extension/src/node/cli-protocol',
     ],

.github/ISSUE_TEMPLATE/bug-report.yml

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

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/feature-request.yml

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

.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

@@ -7,9 +7,6 @@
 - 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

.github/tools/fetch_athena_stats.py

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

.github/workflows/arduino-stats.yaml

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

.github/workflows/build.yml

@@ -4,81 +4,46 @@ on:
   push:
     branches:
       - main
-    paths-ignore:
-      - '.github/**'
-      - '!.github/workflows/build.yml'
-      - '.vscode/**'
-      - 'docs/**'
-      - 'scripts/**'
-      - 'static/**'
-      - '*.md'
     tags:
       - '[0-9]+.[0-9]+.[0-9]+*'
   workflow_dispatch:
   pull_request:
-    paths-ignore:
-      - '.github/**'
-      - '!.github/workflows/build.yml'
-      - '.vscode/**'
-      - 'docs/**'
-      - 'scripts/**'
-      - 'static/**'
-      - '*.md'
+    branches:
+      - main
   schedule:
     - cron: '0 3 * * *' # run every day at 3AM (https://docs.github.com/en/actions/reference/events-that-trigger-workflows#scheduled-events-schedule)
 
 env:
-  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: "1.19"
   JOB_TRANSFER_ARTIFACT: build-artifacts
   CHANGELOG_ARTIFACTS: changelog
 
 jobs:
   build:
-    name: build (${{ matrix.config.os }})
+    if: github.repository == 'arduino/arduino-ide'
     strategy:
       matrix:
         config:
           - os: windows-2019
-            certificate-secret: WINDOWS_SIGNING_CERTIFICATE_PFX # Name of the secret that contains the certificate.
-            certificate-password-secret: WINDOWS_SIGNING_CERTIFICATE_PASSWORD # Name of the secret that contains the certificate password.
-            certificate-extension: pfx  # File extension for the certificate.
-          - os: ubuntu-20.04
+          - os: ubuntu-18.04 # https://github.com/arduino/arduino-ide/issues/259
           - os: macos-latest
-            # APPLE_SIGNING_CERTIFICATE_P12 secret was produced by following the procedure from:
-            # https://www.kencochrane.com/2020/08/01/build-and-sign-golang-binaries-for-macos-with-github-actions/#exporting-the-developer-certificate
-            certificate-secret: APPLE_SIGNING_CERTIFICATE_P12
-            certificate-password-secret: KEYCHAIN_PASSWORD
-            certificate-extension: p12
     runs-on: ${{ matrix.config.os }}
     timeout-minutes: 90
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
-      - name: Install Node.js 16.x
-        uses: actions/setup-node@v3
+      - name: Install Node.js 14.x
+        uses: actions/setup-node@v1
         with:
-          node-version: '16.x'
+          node-version: '14.x'
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install Python 3.x
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v2
         with:
           python-version: '3.x'
 
-      - name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - name: Install Taskfile
-        uses: arduino/setup-task@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          version: 3.x
-
       - name: Package
         shell: bash
         env:
@@ -90,27 +55,34 @@ jobs:
           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/') }}
-          CAN_SIGN: ${{ secrets[matrix.config.certificate-secret] != '' }}
+          IS_FORK: ${{ github.event.pull_request.head.repo.fork == true }}
         run: |
           # See: https://www.electron.build/code-signing
-          if [ $CAN_SIGN = false ]; then
-            echo "Skipping the app signing: certificate not provided."
+          if [ $IS_FORK = true ]; then
+            echo "Skipping the app signing: building from a fork."
           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
+            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"
+
+              export CSC_KEY_PASSWORD="${{ secrets.KEYCHAIN_PASSWORD }}"
+
+            elif [ "${{ runner.OS }}" = "Windows" ]; then
+              export CSC_LINK="${{ runner.temp }}/signing_certificate.pfx"
+              npm config set msvs_version 2017 --global
+              echo "${{ secrets.WINDOWS_SIGNING_CERTIFICATE_PFX }}" | base64 --decode > "$CSC_LINK"
+
+              export CSC_KEY_PASSWORD="${{ secrets.WINDOWS_SIGNING_CERTIFICATE_PASSWORD }}"
+            fi
           fi
 
-          if [ "${{ runner.OS }}" = "Windows" ]; then
-            npm config set msvs_version 2017 --global
-          fi
-          npx node-gyp install
           yarn --cwd ./electron/packager/
           yarn --cwd ./electron/packager/ package
 
       - name: Upload [GitHub Actions]
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: ${{ env.JOB_TRANSFER_ARTIFACT }}
           path: electron/build/dist/build-artifacts/
@@ -141,13 +113,13 @@ jobs:
 
     steps:
       - name: Download job transfer artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
         with:
           name: ${{ env.JOB_TRANSFER_ARTIFACT }}
           path: ${{ env.JOB_TRANSFER_ARTIFACT }}
 
       - name: Upload tester build artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: ${{ matrix.artifact.name }}
           path: ${{ env.JOB_TRANSFER_ARTIFACT }}/${{ matrix.artifact.path }}
@@ -159,7 +131,7 @@ jobs:
       BODY: ${{ steps.changelog.outputs.BODY }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           fetch-depth: 0 # To fetch all history for all branches and tags.
 
@@ -181,19 +153,15 @@ jobs:
             fi
           fi
           echo -e "$BODY"
-
-          # Set workflow step output
-          # See: https://docs.github.com/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
-          DELIMITER="$RANDOM"
-          echo "BODY<<$DELIMITER" >> $GITHUB_OUTPUT
-          echo "$BODY" >> $GITHUB_OUTPUT
-          echo "$DELIMITER" >> $GITHUB_OUTPUT
-
+          OUTPUT_SAFE_BODY="${BODY//'%'/'%25'}"
+          OUTPUT_SAFE_BODY="${OUTPUT_SAFE_BODY//$'\n'/'%0A'}"
+          OUTPUT_SAFE_BODY="${OUTPUT_SAFE_BODY//$'\r'/'%0D'}"
+          echo "::set-output name=BODY::$OUTPUT_SAFE_BODY"
           echo "$BODY" > CHANGELOG.txt
 
       - name: Upload Changelog [GitHub Actions]
         if: github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main')
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           name: ${{ env.JOB_TRANSFER_ARTIFACT }}
           path: CHANGELOG.txt
@@ -204,7 +172,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Download [GitHub Actions]
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
         with:
           name: ${{ env.JOB_TRANSFER_ARTIFACT }}
           path: ${{ env.JOB_TRANSFER_ARTIFACT }}
@@ -221,11 +189,11 @@ jobs:
 
   release:
     needs: changelog
-    if: startsWith(github.ref, 'refs/tags/')
+    if: github.repository == 'arduino/arduino-ide' && startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
     steps:
       - name: Download [GitHub Actions]
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
         with:
           name: ${{ env.JOB_TRANSFER_ARTIFACT }}
           path: ${{ env.JOB_TRANSFER_ARTIFACT }}
@@ -233,10 +201,10 @@ jobs:
       - 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.5.0
+        uses: svenstaro/upload-release-action@2.2.0
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           release_name: ${{ steps.tag_name.outputs.TAG_NAME }}
@@ -245,17 +213,7 @@ jobs:
           file_glob: true
           body: ${{ needs.changelog.outputs.BODY }}
 
-      # Temporary measure to prevent release update offers before the manually produced builds are uploaded.
-      # The step must be removed once fully automated builds are regained.
-      - name: Remove "channel update info files" related to manual builds
-        run: |
-          # See: https://github.com/arduino/arduino-ide/issues/2018
-          rm "${{ env.JOB_TRANSFER_ARTIFACT }}/stable-linux.yml"
-          # See: https://github.com/arduino/arduino-ide/issues/408
-          rm "${{ env.JOB_TRANSFER_ARTIFACT }}/stable-mac.yml"
-
       - name: Publish Release [S3]
-        if: github.repository == 'arduino/arduino-ide'
         uses: docker://plugins/s3
         env:
           PLUGIN_SOURCE: '${{ env.JOB_TRANSFER_ARTIFACT }}/*'
@@ -277,6 +235,6 @@ jobs:
 
     steps:
       - name: Remove unneeded job transfer artifact
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v1
         with:
           name: ${{ env.JOB_TRANSFER_ARTIFACT }}

.github/workflows/check-certificates.yml

@@ -59,9 +59,7 @@ jobs:
           (
             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
@@ -89,7 +87,6 @@ jobs:
               openssl pkcs12 \
                 -in "${{ env.CERTIFICATE_PATH }}" \
                 -clcerts \
-                -legacy \
                 -nodes \
                 -passin env:CERTIFICATE_PASSWORD
             ) | (
@@ -111,7 +108,7 @@ jobs:
           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

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

@@ -1,9 +1,5 @@
 name: Check Internationalization
 
-env:
-  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: "1.19"
-
 # See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
 on:
   push:
@@ -27,29 +23,16 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
-      - name: Install Node.js 16.x
-        uses: actions/setup-node@v3
+      - name: Install Node.js 14.x
+        uses: actions/setup-node@v2
         with:
-          node-version: '16.x'
+          node-version: '14.x'
           registry-url: 'https://registry.npmjs.org'
 
-      - name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - name: Install Taskfile
-        uses: arduino/setup-task@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          version: 3.x
-
       - name: Install dependencies
         run: yarn
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Check for errors
         run: yarn i18n:check

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

@@ -8,7 +8,7 @@ on:
 env:
   CHANGELOG_ARTIFACTS: changelog
   # See: https://github.com/actions/setup-node/#readme
-  NODE_VERSION: 16.x
+  NODE_VERSION: 14.x
 
 jobs:
   create-changelog:
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Install Node.js
         uses: actions/setup-node@v3
@@ -27,7 +27,7 @@ jobs:
       - 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: Create full changelog
         id: full-changelog

.github/workflows/github-stats.yaml

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

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

@@ -1,9 +1,5 @@
 name: i18n-nightly-push
 
-env:
-  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: "1.19"
-
 on:
   schedule:
     # run every day at 1AM
@@ -14,25 +10,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
-      - name: Install Node.js 16.x
-        uses: actions/setup-node@v3
+      - name: Install Node.js 14.x
+        uses: actions/setup-node@v2
         with:
-          node-version: '16.x'
+          node-version: '14.x'
           registry-url: 'https://registry.npmjs.org'
 
-      - name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - name: Install Task
-        uses: arduino/setup-task@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          version: 3.x
-
       - name: Install dependencies
         run: yarn
 

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

@@ -1,9 +1,5 @@
 name: i18n-weekly-pull
 
-env:
-  # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: "1.19"
-
 on:
   schedule:
     # run every monday at 2AM
@@ -14,25 +10,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
-      - name: Install Node.js 16.x
-        uses: actions/setup-node@v3
+      - name: Install Node.js 14.x
+        uses: actions/setup-node@v2
         with:
-          node-version: '16.x'
+          node-version: '14.x'
           registry-url: 'https://registry.npmjs.org'
 
-      - name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - name: Install Task
-        uses: arduino/setup-task@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          version: 3.x
-
       - name: Install dependencies
         run: yarn
 
@@ -45,7 +30,7 @@ jobs:
           TRANSIFEX_API_KEY: ${{ secrets.TRANSIFEX_API_KEY }}
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v3
         with:
           commit-message: Updated translation files
           title: Update translation files

.github/workflows/sync-labels.yml

@@ -27,11 +27,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Download JSON schema for labels configuration file
         id: download-schema
-        uses: carlosperate/download-file-action@v2
+        uses: carlosperate/download-file-action@v1
         with:
           file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/arduino-tooling-gh-label-configuration-schema.json
           location: ${{ runner.temp }}/label-configuration-schema
@@ -66,12 +66,12 @@ jobs:
 
     steps:
       - name: Download
-        uses: carlosperate/download-file-action@v2
+        uses: carlosperate/download-file-action@v1
         with:
           file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}
 
       - name: Pass configuration files to next job via workflow artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v2
         with:
           path: |
             *.yaml
@@ -103,19 +103,19 @@ jobs:
         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
+          echo "::set-output name=flag::--dry-run"
 
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
 
       - name: Download configuration files artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v2
         with:
           name: ${{ env.CONFIGURATIONS_ARTIFACT }}
           path: ${{ env.CONFIGURATIONS_FOLDER }}
 
       - name: Remove unneeded artifact
-        uses: geekyeggo/delete-artifact@v2
+        uses: geekyeggo/delete-artifact@v1
         with:
           name: ${{ env.CONFIGURATIONS_ARTIFACT }}
 

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

@@ -1,62 +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.19"
-  NODE_VERSION: 16.x
-
-jobs:
-  pull-from-jsonbin:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Install Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          registry-url: 'https://registry.npmjs.org'
-
-      - name: Install Go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - name: Install Task
-        uses: arduino/setup-task@v1
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          version: 3.x
-
-      - name: Install dependencies
-        run: yarn
-
-      - name: Run themes:pull script
-        run: yarn run themes:pull
-        env:
-          JSONBIN_MASTER_KEY: ${{ secrets.JSONBIN_MASTER_KEY }}
-          JSONBIN_ID: ${{ secrets.JSONBIN_ID }}
-
-      - name: Generate dark tokens
-        run: npx token-transformer scripts/themes/tokens/arduino-tokens.json scripts/themes/tokens/dark.json core,ide-default,ide-dark,theia core,ide-default,ide-dark
-
-      - name: Generate default tokens
-        run: npx token-transformer scripts/themes/tokens/arduino-tokens.json scripts/themes/tokens/default.json core,ide-default,theia core,ide-default
-
-      - name: Run themes:generate script
-        run: yarn run themes:generate
-
-      - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
-        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

@@ -4,10 +4,10 @@ node_modules/
 lib/
 downloads/
 build/
-arduino-ide-extension/Examples/
+Examples/
 !electron/build/
 src-gen/
-webpack.config.js
+!webpack.config.js
 gen-webpack.config.js
 .DS_Store
 # switching from `electron` to `browser` in dev mode.
@@ -15,11 +15,5 @@ gen-webpack.config.js
 yarn*.log
 # For the VS Code extensions used by Theia.
 plugins
-# the tokens folder for the themes
-scripts/themes/tokens
-# environment variables
-.env
-# content trace files for electron
-electron-app/traces
-# any Arduino LS generated log files
-inols*.log
+# the config files for the CLI
+arduino-ide-extension/data/cli/config

.prettierrc

@@ -2,6 +2,5 @@
 	"singleQuote": true,
 	"tabWidth": 2,
 	"useTabs": false,
-	"printWidth": 80,
-	"endOfLine": "auto"
+	"printWidth": 80
 }

.vscode/launch.json

@@ -1,43 +1,6 @@
 {
   "version": "0.2.0",
   "configurations": [
-    {
-      "type": "node",
-      "request": "launch",
-      "name": "App (Electron) [Dev]",
-      "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron",
-      "windows": {
-        "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd",
-      },
-      "cwd": "${workspaceFolder}/electron-app",
-      "args": [
-        ".",
-        "--log-level=debug",
-        "--hostname=localhost",
-        "--app-project-path=${workspaceRoot}/electron-app",
-        "--remote-debugging-port=9222",
-        "--no-app-auto-install",
-        "--plugins=local-dir:../plugins",
-        "--hosted-plugin-inspect=9339",
-        "--content-trace",
-        "--open-devtools",
-        "--no-ping-timeout",
-      ],
-      "env": {
-        "NODE_ENV": "development"
-      },
-      "sourceMaps": true,
-      "outFiles": [
-        "${workspaceRoot}/electron-app/src-gen/backend/*.js",
-        "${workspaceRoot}/electron-app/src-gen/frontend/*.js",
-        "${workspaceRoot}/electron-app/lib/**/*.js",
-        "${workspaceRoot}/arduino-ide-extension/lib/**/*.js",
-        "${workspaceRoot}/node_modules/@theia/**/*.js"
-      ],
-      "smartStep": true,
-      "internalConsoleOptions": "openOnSessionStart",
-      "outputCapture": "std"
-    },
     {
       "type": "node",
       "request": "launch",
@@ -47,16 +10,17 @@
         "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron.cmd",
       },
       "cwd": "${workspaceFolder}/electron-app",
+      "protocol": "inspector",
       "args": [
         ".",
         "--log-level=debug",
         "--hostname=localhost",
+        "--no-cluster",
         "--app-project-path=${workspaceRoot}/electron-app",
         "--remote-debugging-port=9222",
         "--no-app-auto-install",
         "--plugins=local-dir:../plugins",
-        "--hosted-plugin-inspect=9339",
-        "--no-ping-timeout",
+        "--hosted-plugin-inspect=9339"
       ],
       "env": {
         "NODE_ENV": "development"
@@ -83,6 +47,38 @@
     {
       "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": [

.vscode/settings.json

@@ -2,9 +2,6 @@
   "files.exclude": {
     "**/lib": false
   },
-  "search.exclude": {
-    "arduino-ide-extension/src/test/node/__test_sketchbook__": true
-  },
   "typescript.tsdk": "node_modules/typescript/lib",
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true

.vscode/tasks.json

@@ -12,6 +12,17 @@
         "clear": false
       }
     },
+    {
+      "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",
@@ -23,6 +34,17 @@
         "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": "Arduino IDE - Watch Electron App",
       "type": "shell",
@@ -34,6 +56,14 @@
         "clear": false
       }
     },
+    {
+      "label": "Arduino IDE - Watch All [Browser]",
+      "type": "shell",
+      "dependsOn": [
+        "Arduino IDE - Watch IDE Extension",
+        "Arduino IDE - Watch Browser App"
+      ]
+    },
     {
       "label": "Arduino IDE - Watch All [Electron]",
       "type": "shell",

BUILDING.md

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

README.md

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

arduino-ide-extension/README.md

@@ -62,15 +62,6 @@ The Config Service knows about your system, like for example the default sketch
   - 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:

arduino-ide-extension/package.json

@@ -1,14 +1,15 @@
 {
   "name": "arduino-ide-extension",
-  "version": "2.1.1",
+  "version": "2.0.0-rc6",
   "description": "An extension for Theia building the Arduino IDE",
   "license": "AGPL-3.0-or-later",
   "scripts": {
-    "prepare": "yarn download-cli && yarn download-fwuploader && yarn download-ls && yarn copy-i18n && yarn clean && yarn download-examples && yarn build && yarn test",
+    "prepare": "yarn download-cli && yarn download-fwuploader && yarn download-ls && yarn copy-serial-plotter && yarn copy-i18n && yarn clean && yarn download-examples && yarn build && yarn test",
     "clean": "rimraf lib",
     "compose-changelog": "node ./scripts/compose-changelog.js",
     "download-cli": "node ./scripts/download-cli.js",
     "download-fwuploader": "node ./scripts/download-fwuploader.js",
+    "copy-serial-plotter": "npx ncp ../node_modules/arduino-serial-plotter-webapp ./build/arduino-serial-plotter-webapp",
     "copy-i18n": "npx ncp ../i18n ./build/i18n",
     "download-ls": "node ./scripts/download-ls.js",
     "download-examples": "node ./scripts/download-examples.js",
@@ -17,90 +18,82 @@
     "build": "tsc && ncp ./src/node/cli-protocol/ ./lib/node/cli-protocol/ && yarn lint",
     "watch": "tsc -w",
     "test": "mocha \"./lib/test/**/*.test.js\"",
-    "test:slow": "mocha \"./lib/test/**/*.slow-test.js\" --slow 5000",
     "test:watch": "mocha --watch --watch-files lib \"./lib/test/**/*.test.js\""
   },
   "dependencies": {
-    "@grpc/grpc-js": "^1.6.7",
-    "@theia/application-package": "1.31.1",
-    "@theia/core": "1.31.1",
-    "@theia/debug": "1.31.1",
-    "@theia/editor": "1.31.1",
-    "@theia/electron": "1.31.1",
-    "@theia/filesystem": "1.31.1",
-    "@theia/keymaps": "1.31.1",
-    "@theia/markers": "1.31.1",
-    "@theia/messages": "1.31.1",
-    "@theia/monaco": "1.31.1",
-    "@theia/monaco-editor-core": "1.67.2",
-    "@theia/navigator": "1.31.1",
-    "@theia/outline-view": "1.31.1",
-    "@theia/output": "1.31.1",
-    "@theia/plugin-ext": "1.31.1",
-    "@theia/preferences": "1.31.1",
-    "@theia/scm": "1.31.1",
-    "@theia/search-in-workspace": "1.31.1",
-    "@theia/terminal": "1.31.1",
-    "@theia/typehierarchy": "1.31.1",
-    "@theia/workspace": "1.31.1",
+    "@grpc/grpc-js": "^1.3.7",
+    "@theia/application-package": "1.22.1",
+    "@theia/core": "1.22.1",
+    "@theia/editor": "1.22.1",
+    "@theia/editor-preview": "1.22.1",
+    "@theia/electron": "1.22.1",
+    "@theia/filesystem": "1.22.1",
+    "@theia/git": "1.22.1",
+    "@theia/keymaps": "1.22.1",
+    "@theia/markers": "1.22.1",
+    "@theia/monaco": "1.22.1",
+    "@theia/navigator": "1.22.1",
+    "@theia/outline-view": "1.22.1",
+    "@theia/output": "1.22.1",
+    "@theia/preferences": "1.22.1",
+    "@theia/search-in-workspace": "1.22.1",
+    "@theia/terminal": "1.22.1",
+    "@theia/workspace": "1.22.1",
     "@tippyjs/react": "^4.2.5",
+    "@types/atob": "^2.1.2",
     "@types/auth0-js": "^9.14.0",
     "@types/btoa": "^1.2.3",
     "@types/dateformat": "^3.0.1",
     "@types/deepmerge": "^2.2.0",
-    "@types/glob": "^7.2.0",
+    "@types/glob": "^5.0.35",
     "@types/google-protobuf": "^3.7.2",
     "@types/js-yaml": "^3.12.2",
     "@types/keytar": "^4.4.0",
     "@types/lodash.debounce": "^4.0.6",
+    "@types/ncp": "^2.0.4",
     "@types/node-fetch": "^2.5.7",
-    "@types/p-queue": "^2.3.1",
     "@types/ps-tree": "^1.1.0",
+    "@types/react-select": "^3.0.0",
     "@types/react-tabs": "^2.3.2",
     "@types/temp": "^0.8.34",
     "@types/which": "^1.3.1",
-    "@vscode/debugprotocol": "^1.51.0",
-    "arduino-serial-plotter-webapp": "0.2.0",
+    "ajv": "^6.5.3",
+    "arduino-serial-plotter-webapp": "0.0.17",
     "async-mutex": "^0.3.0",
+    "atob": "^2.1.2",
     "auth0-js": "^9.14.0",
     "btoa": "^1.2.1",
-    "classnames": "^2.3.1",
-    "cpy": "^8.1.2",
-    "cross-fetch": "^3.1.5",
+    "css-element-queries": "^1.2.0",
     "dateformat": "^3.0.3",
     "deepmerge": "2.0.1",
     "electron-updater": "^4.6.5",
-    "fast-json-stable-stringify": "^2.1.0",
-    "fast-safe-stringify": "^2.1.1",
-    "filename-reserved-regex": "^2.0.0",
+    "fuzzy": "^0.1.3",
     "glob": "^7.1.6",
-    "google-protobuf": "^3.20.1",
+    "google-protobuf": "^3.11.4",
+    "grpc": "^1.24.11",
     "hash.js": "^1.1.7",
-    "is-online": "^9.0.1",
+    "is-valid-path": "^0.1.1",
     "js-yaml": "^3.13.1",
-    "jsonc-parser": "^2.2.0",
-    "just-diff": "^5.1.1",
     "jwt-decode": "^3.1.2",
     "keytar": "7.2.0",
     "lodash.debounce": "^4.0.8",
-    "minimatch": "^3.1.2",
+    "ncp": "^2.0.0",
     "node-fetch": "^2.6.1",
     "open": "^8.0.6",
-    "p-debounce": "^2.1.0",
-    "p-queue": "^2.4.2",
+    "p-queue": "^5.0.0",
     "ps-tree": "^1.2.0",
     "query-string": "^7.0.1",
-    "react-disable": "^0.1.1",
+    "react-disable": "^0.1.0",
     "react-markdown": "^8.0.0",
-    "react-perfect-scrollbar": "^1.5.8",
-    "react-select": "^5.6.0",
+    "react-select": "^3.0.4",
     "react-tabs": "^3.1.2",
     "react-window": "^1.8.6",
     "semver": "^7.3.2",
     "string-natural-compare": "^2.0.3",
     "temp": "^0.9.1",
-    "temp-dir": "^2.0.0",
     "tree-kill": "^1.2.1",
+    "upath": "^1.1.2",
+    "url": "^0.11.0",
     "which": "^1.3.1"
   },
   "devDependencies": {
@@ -109,10 +102,11 @@
     "@types/chai-string": "^1.4.2",
     "@types/mocha": "^5.2.7",
     "@types/react-window": "^1.8.5",
+    "@types/sinon": "^10.0.6",
+    "@types/sinon-chai": "^3.2.6",
     "chai": "^4.2.0",
     "chai-string": "^1.5.0",
     "decompress": "^4.2.0",
-    "decompress-tarbz2": "^4.1.1",
     "decompress-targz": "^4.1.1",
     "decompress-unzip": "^4.0.1",
     "download": "^7.1.0",
@@ -120,9 +114,11 @@
     "mocha": "^7.0.0",
     "mockdate": "^3.0.5",
     "moment": "^2.24.0",
-    "ncp": "^2.0.0",
     "protoc": "^1.0.4",
     "shelljs": "^0.8.3",
+    "sinon": "^12.0.1",
+    "sinon-chai": "^3.7.0",
+    "typemoq": "^2.1.0",
     "uuid": "^3.2.1",
     "yargs": "^11.1.0"
   },
@@ -152,27 +148,25 @@
       "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"
-    },
     {
       "electronMain": "lib/electron-main/arduino-electron-main-module"
     }
   ],
   "arduino": {
     "cli": {
-      "version": "0.32.3"
+      "version": "0.22.0"
     },
     "fwuploader": {
-      "version": "2.2.2"
+      "version": "2.0.0"
     },
     "clangd": {
-      "version": "14.0.0"
+      "version": "13.0.0"
     },
     "languageServer": {
-      "version": "0.7.4"
+      "version": "0.6.0"
     }
   }
 }

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

@@ -1,90 +1,141 @@
 // @ts-check
 
 (async () => {
-  const path = require('path');
-  const shell = require('shelljs');
-  const semver = require('semver');
-  const moment = require('moment');
-  const downloader = require('./downloader');
-  const { taskBuildFromGit } = require('./utils');
 
-  const 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;
-    if (!cli) {
-      return undefined;
-    }
-
-    const { version } = cli;
-    return version;
-  })();
-
-  if (!version) {
-    shell.echo(`Could not retrieve CLI version info from the 'package.json'.`);
-    shell.exit(1);
-  }
-
-  const { platform, arch } = process;
-  const buildFolder = path.join(__dirname, '..', 'build');
-  const cliName = `arduino-cli${platform === 'win32' ? '.exe' : ''}`;
-  const destinationPath = path.join(buildFolder, cliName);
-
-  if (typeof version === 'string') {
-    const suffix = (() => {
-      switch (platform) {
-        case 'darwin':
-          if (arch === 'arm64') {
-            return 'macOS_ARM64.tar.gz';
-          }
-          return 'macOS_64bit.tar.gz';
-        case 'win32':
-          return 'Windows_64bit.zip';
-        case 'linux': {
-          switch (arch) {
-            case 'arm':
-              return 'Linux_ARMv7.tar.gz';
-            case 'arm64':
-              return 'Linux_ARM64.tar.gz';
-            case 'x64':
-              return 'Linux_64bit.tar.gz';
-            default:
-              return undefined;
-          }
+    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) {
-      shell.echo(`The CLI is not available for ${platform} ${arch}.`);
-      shell.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}`;
-      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');
+
+    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 {
-      shell.echo(`🔥  Could not interpret 'version': ${version}`);
-      shell.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,96 +1,33 @@
 // @ts-check
 
 // The version to use.
-const version = '1.10.0';
+const version = '1.9.1';
 
 (async () => {
-  const os = require('os');
-  const { promises: fs } = require('fs');
-  const path = require('path');
-  const shell = require('shelljs');
-  const { v4 } = require('uuid');
 
-  const repository = path.join(os.tmpdir(), `${v4()}-arduino-examples`);
-  if (shell.mkdir('-p', repository).code !== 0) {
-    shell.exit(1);
-  }
+    const os = require('os');
+    const path = require('path');
+    const shell = require('shelljs');
+    const { v4 } = require('uuid');
 
-  if (
-    shell.exec(
-      `git clone https://github.com/arduino/arduino-examples.git ${repository}`
-    ).code !== 0
-  ) {
-    shell.exit(1);
-  }
-
-  if (
-    shell.exec(`git -C ${repository} checkout tags/${version} -b ${version}`)
-      .code !== 0
-  ) {
-    shell.exit(1);
-  }
-
-  const destination = path.join(__dirname, '..', 'Examples');
-  shell.mkdir('-p', destination);
-  shell.cp('-fR', path.join(repository, 'examples', '*'), destination);
-
-  const isSketch = async (pathLike) => {
-    try {
-      const names = await fs.readdir(pathLike);
-      const dirName = path.basename(pathLike);
-      return names.indexOf(`${dirName}.ino`) !== -1;
-    } catch (e) {
-      if (e.code === 'ENOTDIR') {
-        return false;
-      }
-      throw e;
+    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' }
-  );
-  shell.echo(`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-ls.js

@@ -7,23 +7,22 @@
   const path = require('path');
   const shell = require('shelljs');
   const downloader = require('./downloader');
-  const { goBuildFromGit } = require('./utils');
 
-  const [DEFAULT_LS_VERSION, DEFAULT_CLANGD_VERSION] = (() => {
+  const [DEFAULT_ALS_VERSION, DEFAULT_CLANGD_VERSION] = (() => {
     const pkg = require(path.join(__dirname, '..', 'package.json'));
-    if (!pkg) return [undefined, undefined];
+    if (!pkg) return undefined;
 
     const { arduino } = pkg;
-    if (!arduino) return [undefined, undefined];
+    if (!arduino) return undefined;
 
     const { languageServer, clangd } = arduino;
-    if (!languageServer) return [undefined, undefined];
-    if (!clangd) return [undefined, undefined];
+    if (!languageServer) return undefined;
+    if (!clangd) return undefined;
 
     return [languageServer.version, clangd.version];
   })();
 
-  if (!DEFAULT_LS_VERSION) {
+  if (!DEFAULT_ALS_VERSION) {
     shell.echo(
       `Could not retrieve Arduino Language Server version info from the 'package.json'.`
     );
@@ -40,8 +39,8 @@
   const yargs = require('yargs')
     .option('ls-version', {
       alias: 'lv',
-      default: DEFAULT_LS_VERSION,
-      describe: `The version of the 'arduino-language-server' to download. Defaults to ${DEFAULT_LS_VERSION}.`,
+      default: DEFAULT_ALS_VERSION,
+      describe: `The version of the 'arduino-language-server' to download. Defaults to ${DEFAULT_ALS_VERSION}.`,
     })
     .option('clangd-version', {
       alias: 'cv',
@@ -57,7 +56,7 @@
     .version(false)
     .parse();
 
-  const lsVersion = yargs['ls-version'];
+  const alsVersion = yargs['ls-version'];
   const clangdVersion = yargs['clangd-version'];
   const force = yargs['force-download'];
   const { platform, arch } = process;
@@ -67,35 +66,24 @@
     build,
     `arduino-language-server${platform === 'win32' ? '.exe' : ''}`
   );
-  let clangdExecutablePath, clangFormatExecutablePath, lsSuffix, clangdSuffix;
+  let clangdExecutablePath, lsSuffix, clangdSuffix;
 
   switch (platformArch) {
     case 'darwin-x64':
       clangdExecutablePath = path.join(build, 'clangd');
-      clangFormatExecutablePath = path.join(build, 'clang-format');
       lsSuffix = 'macOS_64bit.tar.gz';
       clangdSuffix = 'macOS_64bit';
       break;
-    case 'darwin-arm64':
-      clangdExecutablePath = path.join(build, 'clangd');
-      clangFormatExecutablePath = path.join(build, 'clang-format');
-      lsSuffix = 'macOS_ARM64.tar.gz';
-      clangdSuffix = 'macOS_ARM64';
-      break;
     case 'linux-x64':
       clangdExecutablePath = path.join(build, 'clangd');
-      clangFormatExecutablePath = path.join(build, 'clang-format');
       lsSuffix = 'Linux_64bit.tar.gz';
       clangdSuffix = 'Linux_64bit';
       break;
     case 'win32-x64':
       clangdExecutablePath = path.join(build, 'clangd.exe');
-      clangFormatExecutablePath = path.join(build, 'clang-format.exe');
       lsSuffix = 'Windows_64bit.zip';
       clangdSuffix = 'Windows_64bit';
       break;
-    default:
-      throw new Error(`Unsupported platform/arch: ${platformArch}.`);
   }
   if (!lsSuffix || !clangdSuffix) {
     shell.echo(
@@ -104,30 +92,15 @@
     shell.exit(1);
   }
 
-  if (typeof lsVersion === 'string') {
-    const lsUrl = `https://downloads.arduino.cc/arduino-language-server/${
-      lsVersion === 'nightly'
-        ? 'nightly/arduino-language-server'
-        : 'arduino-language-server_' + lsVersion
-    }_${lsSuffix}`;
-    downloader.downloadUnzipAll(lsUrl, build, lsExecutablePath, force);
-  } else {
-    goBuildFromGit(lsVersion, lsExecutablePath, 'language-server');
-  }
+  const 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/tools/clangd_${clangdVersion}_${clangdSuffix}.tar.bz2`;
   downloader.downloadUnzipAll(clangdUrl, build, clangdExecutablePath, force, {
     strip: 1,
   }); // `strip`: the new clangd (12.x) is zipped into a folder, so we have to strip the outmost folder.
-
-  const clangdFormatUrl = `https://downloads.arduino.cc/tools/clang-format_${clangdVersion}_${clangdSuffix}.tar.bz2`;
-  downloader.downloadUnzipAll(
-    clangdFormatUrl,
-    build,
-    clangFormatExecutablePath,
-    force,
-    {
-      strip: 1,
-    }
-  );
 })();

arduino-ide-extension/scripts/downloader.js

@@ -86,7 +86,6 @@ exports.downloadUnzipFile = async (
  * @param targetDir {string}  Directory into which to decompress the archive
  * @param targetFile {string} Path to the main file expected after decompressing
  * @param force {boolean}     Whether to download even if the target file exists
- * @param decompressOptions {import('decompress').DecompressOptions}
  */
 exports.downloadUnzipAll = async (
   url,

arduino-ide-extension/scripts/utils.js

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

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

@@ -0,0 +1,21 @@
+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,16 +1,30 @@
+import { inject, injectable, postConstruct } from 'inversify';
+import * as React from 'react';
 import * as remote from '@theia/core/electron-shared/@electron/remote';
 import {
-  inject,
-  injectable,
-  postConstruct,
-} from '@theia/core/shared/inversify';
-import * as React from '@theia/core/shared/react';
+  BoardsService,
+  SketchesService,
+  ExecutableService,
+  Sketch,
+  LibraryService,
+} from '../common/protocol';
+import { Mutex } from 'async-mutex';
 import {
   MAIN_MENU_BAR,
   MenuContribution,
   MenuModelRegistry,
+  ILogger,
+  DisposableCollection,
 } from '@theia/core';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser';
+import {
+  FrontendApplication,
+  FrontendApplicationContribution,
+  LocalStorageService,
+  SaveableWidget,
+  StatusBar,
+  StatusBarAlignment,
+} from '@theia/core/lib/browser';
+import { nls } from '@theia/core/lib/common';
 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';
@@ -18,24 +32,50 @@ import {
   TabBarToolbarContribution,
   TabBarToolbarRegistry,
 } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import { nls } from '@theia/core/lib/common';
 import {
   CommandContribution,
   CommandRegistry,
 } from '@theia/core/lib/common/command';
 import { MessageService } from '@theia/core/lib/common/message-service';
-import { EditorCommands, EditorMainMenu } from '@theia/editor/lib/browser';
+import URI from '@theia/core/lib/common/uri';
+import {
+  EditorCommands,
+  EditorMainMenu,
+  EditorManager,
+  EditorOpenerOptions,
+} from '@theia/editor/lib/browser';
+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 { FileNavigatorCommands, 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 { ElectronWindowPreferences } from '@theia/core/lib/electron-browser/window/electron-window-preferences';
+import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import { FileChangeType } from '@theia/filesystem/lib/browser';
+import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
+import { ConfigService } from '../common/protocol/config-service';
+import { ArduinoCommands } from './arduino-commands';
+import { BoardsConfig } from './boards/boards-config';
+import { BoardsConfigDialog } from './boards/boards-config-dialog';
 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 { ArduinoToolbar } from './toolbar/arduino-toolbar';
-import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
-import { SerialPlotterContribution } from './serial/plotter/plotter-frontend-contribution';
+import { ArduinoPreferences } from './arduino-preferences';
+import { SketchesServiceClientImpl } from '../common/protocol/sketches-service-client-impl';
+import { SaveAsSketch } from './contributions/save-as-sketch';
+import { SketchbookWidgetContribution } from './widgets/sketchbook/sketchbook-widget-contribution';
+import { IDEUpdaterDialog } from './dialogs/ide-updater/ide-updater-dialog';
+import { IDEUpdater } from '../common/protocol/ide-updater';
+import { FileSystemFrontendContribution } from '@theia/filesystem/lib/browser/filesystem-frontend-contribution';
+
+const INIT_LIBS_AND_PACKAGES = 'initializedLibsAndPackages';
+export const SKIP_IDE_VERSION = 'skipIDEVersion';
 
 @injectable()
 export class ArduinoFrontendContribution
@@ -44,25 +84,121 @@ export class ArduinoFrontendContribution
     TabBarToolbarContribution,
     CommandContribution,
     MenuContribution,
-    ColorContribution
-{
+    ColorContribution {
+  @inject(ILogger)
+  protected logger: ILogger;
+
   @inject(MessageService)
-  private readonly messageService: MessageService;
+  protected readonly messageService: MessageService;
+
+  @inject(BoardsService)
+  protected readonly boardsService: BoardsService;
+
+  @inject(LibraryService)
+  protected readonly libraryService: LibraryService;
 
   @inject(BoardsServiceProvider)
-  private readonly boardsServiceProvider: BoardsServiceProvider;
+  protected readonly boardsServiceClientImpl: BoardsServiceProvider;
+
+  @inject(EditorManager)
+  protected readonly editorManager: EditorManager;
+
+  @inject(FileService)
+  protected readonly fileService: FileService;
+
+  @inject(SketchesService)
+  protected readonly sketchService: SketchesService;
+
+  @inject(BoardsConfigDialog)
+  protected readonly boardsConfigDialog: BoardsConfigDialog;
 
   @inject(CommandRegistry)
-  private readonly commandRegistry: CommandRegistry;
+  protected readonly commandRegistry: CommandRegistry;
 
-  @inject(ElectronWindowPreferences)
-  private readonly electronWindowPreferences: ElectronWindowPreferences;
+  @inject(StatusBar)
+  protected readonly statusBar: StatusBar;
 
-  @inject(FrontendApplicationStateService)
-  private readonly appStateService: FrontendApplicationStateService;
+  @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(SketchbookWidgetContribution)
+  protected readonly sketchbookWidgetContribution: SketchbookWidgetContribution;
+
+  @inject(EditorMode)
+  protected readonly editorMode: EditorMode;
+
+  @inject(ConfigService)
+  protected readonly configService: ConfigService;
+
+  @inject(HostedPluginSupport)
+  protected hostedPluginSupport: HostedPluginSupport;
+
+  @inject(ExecutableService)
+  protected executableService: ExecutableService;
+
+  @inject(ArduinoPreferences)
+  protected readonly arduinoPreferences: ArduinoPreferences;
+
+  @inject(SketchesServiceClientImpl)
+  protected readonly sketchServiceClient: SketchesServiceClientImpl;
+
+  protected readonly appStateService: FrontendApplicationStateService;
+
+  @inject(LocalStorageService)
+  protected readonly localStorageService: LocalStorageService;
+
+  @inject(FileSystemFrontendContribution)
+  protected readonly fileSystemFrontendContribution: FileSystemFrontendContribution;
+
+  @inject(IDEUpdater)
+  protected readonly updater: IDEUpdater;
+
+  @inject(IDEUpdaterDialog)
+  protected readonly updaterDialog: IDEUpdaterDialog;
+
+  protected invalidConfigPopup:
+    | Promise<void | 'No' | 'Yes' | undefined>
+    | undefined;
+  protected toDisposeOnStop = new DisposableCollection();
 
   @postConstruct()
   protected async init(): Promise<void> {
+    const isFirstStartup = !(await this.localStorageService.getData(
+      INIT_LIBS_AND_PACKAGES
+    ));
+    if (isFirstStartup) {
+      await this.localStorageService.setData(INIT_LIBS_AND_PACKAGES, true);
+      const avrPackage = await this.boardsService.getBoardPackage({
+        id: 'arduino:avr',
+      });
+      const builtInLibrary = (
+        await this.libraryService.search({
+          query: 'Arduino_BuiltIn',
+        })
+      )[0];
+
+      !!avrPackage && (await this.boardsService.install({ item: avrPackage }));
+      !!builtInLibrary &&
+        (await this.libraryService.install({
+          item: builtInLibrary,
+          installDependencies: true,
+        }));
+    }
     if (!window.navigator.onLine) {
       // tslint:disable-next-line:max-line-length
       this.messageService.warn(
@@ -72,29 +208,243 @@ export class ArduinoFrontendContribution
         )
       );
     }
+    const updateStatusBar = ({
+      selectedBoard,
+      selectedPort,
+    }: BoardsConfig.Config) => {
+      this.statusBar.setElement('arduino-selected-board', {
+        alignment: StatusBarAlignment.RIGHT,
+        text: selectedBoard
+          ? `$(microchip) ${selectedBoard.name}`
+          : `$(close) ${nls.localize(
+              'arduino/common/noBoardSelected',
+              'No board selected'
+            )}`,
+        className: 'arduino-selected-board',
+      });
+      if (selectedBoard) {
+        this.statusBar.setElement('arduino-selected-port', {
+          alignment: StatusBarAlignment.RIGHT,
+          text: selectedPort
+            ? nls.localize(
+                'arduino/common/selectedOn',
+                'on {0}',
+                selectedPort.address
+              )
+            : nls.localize('arduino/common/notConnected', '[not connected]'),
+          className: 'arduino-selected-port',
+        });
+      }
+    };
+    this.boardsServiceClientImpl.onBoardsConfigChanged(updateStatusBar);
+    updateStatusBar(this.boardsServiceClientImpl.boardsConfig);
+    this.appStateService.reachedState('ready').then(async () => {
+      const sketch = await this.sketchServiceClient.currentSketch();
+      if (sketch && !(await this.sketchService.isTemp(sketch))) {
+        this.toDisposeOnStop.push(this.fileService.watch(new URI(sketch.uri)));
+        this.toDisposeOnStop.push(
+          this.fileService.onDidFilesChange(async (event) => {
+            for (const { type, resource } of event.changes) {
+              if (
+                type === FileChangeType.ADDED &&
+                resource.parent.toString() === sketch.uri
+              ) {
+                const reloadedSketch = await this.sketchService.loadSketch(
+                  sketch.uri
+                );
+                if (Sketch.isInSketch(resource, reloadedSketch)) {
+                  this.ensureOpened(resource.toString(), true, {
+                    mode: 'open',
+                  });
+                }
+              }
+            }
+          })
+        );
+      }
+    });
   }
 
-  onStart(): void {
-    this.electronWindowPreferences.onPreferenceChanged((event) => {
+  async onStart(app: FrontendApplication): Promise<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,
+      this.sketchbookWidgetContribution,
+    ] as Array<FrontendApplicationContribution>) {
+      if (viewContribution.initializeLayout) {
+        viewContribution.initializeLayout(app);
+      }
+    }
+
+    this.updater
+      .init(
+        this.arduinoPreferences.get('arduino.ide.updateChannel'),
+        this.arduinoPreferences.get('arduino.ide.updateBaseUrl')
+      )
+      .then(() => this.updater.checkForUpdates(true))
+      .then(async (updateInfo) => {
+        if (!updateInfo) return;
+        const versionToSkip = await this.localStorageService.getData<string>(
+          SKIP_IDE_VERSION
+        );
+        if (versionToSkip === updateInfo.version) return;
+        this.updaterDialog.open(updateInfo);
+      })
+      .catch((e) => {
+        this.messageService.error(
+          nls.localize(
+            'arduino/ide-updater/errorCheckingForUpdates',
+            'Error while checking for Arduino IDE updates.\n{0}',
+            e.message
+          )
+        );
+      });
+
+    const start = async ({ selectedBoard }: BoardsConfig.Config) => {
+      if (selectedBoard) {
+        const { name, fqbn } = selectedBoard;
+        if (fqbn) {
+          this.startLanguageServer(fqbn, name);
+        }
+      }
+    };
+    this.boardsServiceClientImpl.onBoardsConfigChanged(start);
+    this.arduinoPreferences.onPreferenceChanged((event) => {
       if (event.newValue !== event.oldValue) {
         switch (event.preferenceName) {
-          case 'window.zoomLevel':
+          case 'arduino.language.log':
+            start(this.boardsServiceClientImpl.boardsConfig);
+            break;
+          case 'arduino.window.zoomLevel':
             if (typeof event.newValue === 'number') {
               const webContents = remote.getCurrentWebContents();
               webContents.setZoomLevel(event.newValue || 0);
             }
             break;
+          case 'arduino.ide.updateChannel':
+          case 'arduino.ide.updateBaseUrl':
+            this.updater.init(
+              this.arduinoPreferences.get('arduino.ide.updateChannel'),
+              this.arduinoPreferences.get('arduino.ide.updateBaseUrl')
+            );
+            break;
         }
       }
     });
-    this.appStateService.reachedState('ready').then(() =>
-      this.electronWindowPreferences.ready.then(() => {
-        const webContents = remote.getCurrentWebContents();
-        const zoomLevel =
-          this.electronWindowPreferences.get('window.zoomLevel');
-        webContents.setZoomLevel(zoomLevel);
-      })
-    );
+    this.arduinoPreferences.ready.then(() => {
+      const webContents = remote.getCurrentWebContents();
+      const zoomLevel = this.arduinoPreferences.get('arduino.window.zoomLevel');
+      webContents.setZoomLevel(zoomLevel);
+    });
+
+    app.shell.leftPanelHandler.removeBottomMenu('settings-menu');
+
+    this.fileSystemFrontendContribution.onDidChangeEditorFile(e => {
+      if (e.type === FileChangeType.DELETED) {
+        const editorWidget = e.editor;
+        if (SaveableWidget.is(editorWidget)) {
+          editorWidget.closeWithoutSaving();
+        } else {
+          editorWidget.close();
+        }
+      }
+    });
+  }
+
+  onStop(): void {
+    this.toDisposeOnStop.dispose();
+  }
+
+  protected languageServerFqbn?: string;
+  protected languageServerStartMutex = new Mutex();
+  protected async startLanguageServer(
+    fqbn: string,
+    name: string | undefined
+  ): Promise<void> {
+    const release = await this.languageServerStartMutex.acquire();
+    try {
+      await this.hostedPluginSupport.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.commandRegistry.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;
+      }
+      if (fqbn === this.languageServerFqbn) {
+        // NOOP
+        return;
+      }
+      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.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)),
+      ]);
+
+      const config = await this.configService.getConfiguration();
+
+      this.languageServerFqbn = await Promise.race([
+        new Promise<undefined>((_, reject) =>
+          setTimeout(
+            () => reject(new Error(`Timeout after ${20_000} ms.`)),
+            20_000
+          )
+        ),
+        this.commandRegistry.executeCommand<string>(
+          'arduino.languageserver.start',
+          {
+            lsPath,
+            cliDaemonAddr: `localhost:${config.daemon.port}`, // TODO: verify if this port is coming from the BE
+            clangdPath,
+            log: currentSketchPath ? currentSketchPath : log,
+            cliDaemonInstance: '1',
+            board: {
+              fqbn,
+              name: name ? `"${name}"` : undefined,
+            },
+          }
+        ),
+      ]);
+    } catch (e) {
+      console.log(`Failed to start language server for ${fqbn}`, e);
+      this.languageServerFqbn = undefined;
+    } finally {
+      release();
+    }
   }
 
   registerToolbarItems(registry: TabBarToolbarRegistry): void {
@@ -104,21 +454,13 @@ export class ArduinoFrontendContribution
         <BoardsToolBarItem
           key="boardsToolbarItem"
           commands={this.commandRegistry}
-          boardsServiceProvider={this.boardsServiceProvider}
+          boardsServiceClient={this.boardsServiceClientImpl}
         />
       ),
       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,
@@ -127,6 +469,24 @@ export class ArduinoFrontendContribution
   }
 
   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;
+        }
+      },
+    });
+
     for (const command of [
       EditorCommands.SPLIT_EDITOR_DOWN,
       EditorCommands.SPLIT_EDITOR_LEFT,
@@ -134,13 +494,13 @@ export class ArduinoFrontendContribution
       EditorCommands.SPLIT_EDITOR_UP,
       EditorCommands.SPLIT_EDITOR_VERTICAL,
       EditorCommands.SPLIT_EDITOR_HORIZONTAL,
-      FileNavigatorCommands.REVEAL_IN_NAVIGATOR,
+      FileNavigatorCommands.REVEAL_IN_NAVIGATOR
     ]) {
       registry.unregisterCommand(command);
     }
   }
 
-  registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry) {
     const menuId = (menuPath: string[]): string => {
       const index = menuPath.length - 1;
       const menuId = menuPath[index];
@@ -159,12 +519,97 @@ export class ArduinoFrontendContribution
       ArduinoMenus.TOOLS,
       nls.localize('arduino/menu/tools', 'Tools')
     );
+    registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
+      commandId: ArduinoCommands.TOGGLE_COMPILE_FOR_DEBUG.id,
+      label: nls.localize(
+        'arduino/debug/optimizeForDebugging',
+        'Optimize for Debugging'
+      ),
+      order: '5',
+    });
+  }
+
+  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);
+      }
+      if (mainFileUri.endsWith('.pde')) {
+        const message = nls.localize(
+          'arduino/common/oldFormat',
+          "The '{0}' still uses the old `.pde` format. Do you want to switch to the new `.ino` extension?",
+          sketch.name
+        );
+        const yes = nls.localize('vscode/extensionsUtils/yes', 'Yes');
+        this.messageService
+          .info(message, nls.localize('arduino/common/later', 'Later'), yes)
+          .then(async (answer) => {
+            if (answer === yes) {
+              this.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 = false,
+    options?: EditorOpenerOptions | undefined
+  ): Promise<any> {
+    const widget = this.editorManager.all.find(
+      (widget) => widget.editor.uri.toString() === uri
+    );
+    if (!widget || forceOpen) {
+      return this.editorManager.open(new URI(uri), options);
+    }
   }
 
   registerColors(colors: ColorRegistry): void {
     colors.register(
       {
-        id: 'arduino.toolbar.button.background',
+        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',
@@ -174,34 +619,14 @@ export class ArduinoFrontendContribution
           'Background color of the toolbar items. Such as Upload, Verify, etc.',
       },
       {
-        id: 'arduino.toolbar.button.hoverBackground',
+        id: 'arduino.toolbar.hoverBackground',
         defaults: {
           dark: 'button.hoverBackground',
-          light: 'button.hoverBackground',
-          hc: 'button.background',
-        },
-        description:
-          'Background color of the toolbar items when hovering over them. Such as Upload, Verify, etc.',
-      },
-      {
-        id: 'arduino.toolbar.button.secondary.label',
-        defaults: {
-          dark: 'secondaryButton.foreground',
           light: 'button.foreground',
-          hc: 'activityBar.inactiveForeground',
-        },
-        description:
-          'Foreground color of the toolbar items. Such as Serial Monitor and Serial Plotter',
-      },
-      {
-        id: 'arduino.toolbar.button.secondary.hoverBackground',
-        defaults: {
-          dark: 'secondaryButton.hoverBackground',
-          light: 'button.hoverBackground',
           hc: 'textLink.foreground',
         },
         description:
-          'Background color of the toolbar items when hovering over them, such as "Serial Monitor" and "Serial Plotter"',
+          'Background color of the toolbar items when hovering over them. Such as Upload, Verify, etc.',
       },
       {
         id: 'arduino.toolbar.toggleBackground',
@@ -214,72 +639,22 @@ export class ArduinoFrontendContribution
           'Toggle color of the toolbar items when they are currently toggled (the command is in progress)',
       },
       {
-        id: 'arduino.toolbar.dropdown.border',
+        id: 'arduino.output.foreground',
         defaults: {
-          dark: 'dropdown.border',
-          light: 'dropdown.border',
-          hc: 'dropdown.border',
+          dark: 'editor.foreground',
+          light: 'editor.foreground',
+          hc: 'editor.foreground',
         },
-        description: 'Border color of the Board Selector.',
-      },
-
-      {
-        id: 'arduino.toolbar.dropdown.borderActive',
-        defaults: {
-          dark: 'focusBorder',
-          light: 'focusBorder',
-          hc: 'focusBorder',
-        },
-        description: "Border color of the Board Selector when it's active",
-      },
-
-      {
-        id: 'arduino.toolbar.dropdown.background',
-        defaults: {
-          dark: 'tab.unfocusedActiveBackground',
-          light: 'dropdown.background',
-          hc: 'dropdown.background',
-        },
-        description: 'Background color of the Board Selector.',
-      },
-
-      {
-        id: 'arduino.toolbar.dropdown.label',
-        defaults: {
-          dark: 'dropdown.foreground',
-          light: 'dropdown.foreground',
-          hc: 'dropdown.foreground',
-        },
-        description: 'Font color of the Board Selector.',
+        description: 'Color of the text in the Output view.',
       },
       {
-        id: 'arduino.toolbar.dropdown.iconSelected',
+        id: 'arduino.output.background',
         defaults: {
-          dark: 'list.activeSelectionIconForeground',
-          light: 'list.activeSelectionIconForeground',
-          hc: 'list.activeSelectionIconForeground',
+          dark: 'editor.background',
+          light: 'editor.background',
+          hc: 'editor.background',
         },
-        description:
-          'Color of the selected protocol icon in the Board Selector.',
-      },
-      {
-        id: 'arduino.toolbar.dropdown.option.backgroundHover',
-        defaults: {
-          dark: 'list.hoverBackground',
-          light: 'list.hoverBackground',
-          hc: 'list.hoverBackground',
-        },
-        description: 'Background color on hover of the Board Selector options.',
-      },
-      {
-        id: 'arduino.toolbar.dropdown.option.backgroundSelected',
-        defaults: {
-          dark: 'list.activeSelectionBackground',
-          light: 'list.activeSelectionBackground',
-          hc: 'list.activeSelectionBackground',
-        },
-        description:
-          'Background color of the selected board in the Board Selector.',
+        description: 'Background color of the Output view.',
       }
     );
   }

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

@@ -1,9 +1,12 @@
 import '../../src/browser/style/index.css';
-import { Container, ContainerModule } from '@theia/core/shared/inversify';
+import { ContainerModule } from 'inversify';
 import { WidgetFactory } from '@theia/core/lib/browser/widget-manager';
 import { CommandContribution } from '@theia/core/lib/common/command';
 import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
-import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import {
+  TabBarToolbarContribution,
+  TabBarToolbarFactory,
+} from '@theia/core/lib/browser/shell/tab-bar-toolbar';
 import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging/ws-connection-provider';
 import {
   FrontendApplicationContribution,
@@ -23,7 +26,7 @@ import {
   SketchesService,
   SketchesServicePath,
 } from '../common/protocol/sketches-service';
-import { SketchesServiceClientImpl } from './sketches-service-client-impl';
+import { SketchesServiceClientImpl } from '../common/protocol/sketches-service-client-impl';
 import { CoreService, CoreServicePath } from '../common/protocol/core-service';
 import { BoardsListWidget } from './boards/boards-list-widget';
 import { BoardsListWidgetFrontendContribution } from './boards/boards-widget-frontend-contribution';
@@ -39,23 +42,22 @@ import { FileNavigatorContribution as TheiaFileNavigatorContribution } from '@th
 import { KeymapsFrontendContribution } from './theia/keymaps/keymaps-frontend-contribution';
 import { KeymapsFrontendContribution as TheiaKeymapsFrontendContribution } from '@theia/keymaps/lib/browser/keymaps-frontend-contribution';
 import { ArduinoToolbarContribution } from './toolbar/arduino-toolbar-contribution';
-import { EditorContribution as TheiaEditorContribution } from '@theia/editor/lib/browser/editor-contribution';
-import { EditorContribution } from './theia/editor/editor-contribution';
+import { EditorPreviewContribution as TheiaEditorPreviewContribution } from '@theia/editor-preview/lib/browser/editor-preview-contribution';
+import { EditorPreviewContribution } from './theia/editor/editor-contribution';
 import { MonacoStatusBarContribution as TheiaMonacoStatusBarContribution } from '@theia/monaco/lib/browser/monaco-status-bar-contribution';
 import { MonacoStatusBarContribution } from './theia/monaco/monaco-status-bar-contribution';
 import {
   ApplicationShell as TheiaApplicationShell,
   ShellLayoutRestorer as TheiaShellLayoutRestorer,
   CommonFrontendContribution as TheiaCommonFrontendContribution,
-  DockPanelRenderer as TheiaDockPanelRenderer,
+  KeybindingRegistry as TheiaKeybindingRegistry,
   TabBarRendererFactory,
   ContextMenuRenderer,
+  createTreeContainer,
+  TreeWidget,
 } from '@theia/core/lib/browser';
 import { MenuContribution } from '@theia/core/lib/common/menu';
-import {
-  ApplicationShell,
-  DockPanelRenderer,
-} from './theia/core/application-shell';
+import { ApplicationShell } from './theia/core/application-shell';
 import { FrontendApplication } from './theia/core/frontend-application';
 import {
   BoardsConfigDialog,
@@ -79,12 +81,10 @@ import { ProblemManager as TheiaProblemManager } from '@theia/markers/lib/browse
 import { ProblemManager } from './theia/markers/problem-manager';
 import { BoardsAutoInstaller } from './boards/boards-auto-installer';
 import { ShellLayoutRestorer } from './theia/core/shell-layout-restorer';
-import {
-  ArduinoComponentContextMenuRenderer,
-  ListItemRenderer,
-} from './widgets/component-list/list-item-renderer';
+import { EditorMode } from './editor-mode';
+import { ListItemRenderer } from './widgets/component-list/list-item-renderer';
 import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
-
+import { MonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-service';
 import {
   ArduinoDaemonPath,
   ArduinoDaemon,
@@ -93,8 +93,6 @@ import { EditorCommandContribution as TheiaEditorCommandContribution } from '@th
 import {
   FrontendConnectionStatusService,
   ApplicationConnectionStatusContribution,
-  DaemonPort,
-  IsOnline,
 } from './theia/core/connection-status-service';
 import {
   FrontendConnectionStatusService as TheiaFrontendConnectionStatusService,
@@ -102,8 +100,7 @@ import {
 } from '@theia/core/lib/browser/connection-status-service';
 import { BoardsDataMenuUpdater } from './boards/boards-data-menu-updater';
 import { BoardsDataStore } from './boards/boards-data-store';
-import { ILogger } from '@theia/core/lib/common/logger';
-import { bindContributionProvider } from '@theia/core/lib/common/contribution-provider';
+import { ILogger } from '@theia/core';
 import {
   FileSystemExt,
   FileSystemExtPath,
@@ -132,12 +129,16 @@ import { PreferencesContribution as TheiaPreferencesContribution } from '@theia/
 import { PreferencesContribution } from './theia/preferences/preferences-contribution';
 import { QuitApp } from './contributions/quit-app';
 import { SketchControl } from './contributions/sketch-control';
-import { OpenSettings } from './contributions/open-settings';
+import { Settings } from './contributions/settings';
+import { KeybindingRegistry } from './theia/core/keybindings';
 import { WorkspaceCommandContribution } from './theia/workspace/workspace-commands';
 import { WorkspaceDeleteHandler as TheiaWorkspaceDeleteHandler } from '@theia/workspace/lib/browser/workspace-delete-handler';
 import { WorkspaceDeleteHandler } from './theia/workspace/workspace-delete-handler';
+import { TabBarToolbar } from './theia/core/tab-bar-toolbar';
 import { EditorWidgetFactory as TheiaEditorWidgetFactory } from '@theia/editor/lib/browser/editor-widget-factory';
 import { EditorWidgetFactory } from './theia/editor/editor-widget-factory';
+import { OutputWidget as TheiaOutputWidget } from '@theia/output/lib/browser/output-widget';
+import { OutputWidget } from './theia/output/output-widget';
 import { BurnBootloader } from './contributions/burn-bootloader';
 import {
   ExamplesServicePath,
@@ -151,20 +152,13 @@ import {
   OutputChannelRegistryMainImpl as TheiaOutputChannelRegistryMainImpl,
   OutputChannelRegistryMainImpl,
 } from './theia/plugin-ext/output-channel-registry-main';
-import {
-  ExecutableService,
-  ExecutableServicePath,
-  MonitorManagerProxy,
-  MonitorManagerProxyClient,
-  MonitorManagerProxyFactory,
-  MonitorManagerProxyPath,
-} from '../common/protocol';
+import { ExecutableService, ExecutableServicePath, MonitorManagerProxy, MonitorManagerProxyClient, MonitorManagerProxyFactory, MonitorManagerProxyPath } from '../common/protocol';
 import { MonacoTextModelService as TheiaMonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
 import { MonacoTextModelService } from './theia/monaco/monaco-text-model-service';
 import { ResponseServiceImpl } from './response-service-impl';
 import {
   ResponseService,
-  ResponseServiceClient,
+  ResponseServiceArduino,
   ResponseServicePath,
 } from '../common/protocol/response-service';
 import { NotificationCenter } from './notification-center';
@@ -179,6 +173,8 @@ import { EditorCommandContribution } from './theia/editor/editor-command';
 import { NavigatorTabBarDecorator as TheiaNavigatorTabBarDecorator } from '@theia/navigator/lib/browser/navigator-tab-bar-decorator';
 import { NavigatorTabBarDecorator } from './theia/navigator/navigator-tab-bar-decorator';
 import { Debug } from './contributions/debug';
+import { DebugSessionManager } from './theia/debug/debug-session-manager';
+import { DebugSessionManager as TheiaDebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
 import { Sketchbook } from './contributions/sketchbook';
 import { DebugFrontendApplicationContribution } from './theia/debug/debug-frontend-application-contribution';
 import { DebugFrontendApplicationContribution as TheiaDebugFrontendApplicationContribution } from '@theia/debug/lib/browser/debug-frontend-application-contribution';
@@ -201,13 +197,14 @@ import { WorkspaceVariableContribution as TheiaWorkspaceVariableContribution } f
 import { WorkspaceVariableContribution } from './theia/workspace/workspace-variable-contribution';
 import { DebugConfigurationManager } from './theia/debug/debug-configuration-manager';
 import { DebugConfigurationManager as TheiaDebugConfigurationManager } from '@theia/debug/lib/browser/debug-configuration-manager';
+import { SearchInWorkspaceWidget as TheiaSearchInWorkspaceWidget } from '@theia/search-in-workspace/lib/browser/search-in-workspace-widget';
+import { SearchInWorkspaceWidget } from './theia/search-in-workspace/search-in-workspace-widget';
 import { SearchInWorkspaceFactory as TheiaSearchInWorkspaceFactory } from '@theia/search-in-workspace/lib/browser/search-in-workspace-factory';
 import { SearchInWorkspaceFactory } from './theia/search-in-workspace/search-in-workspace-factory';
+import { SearchInWorkspaceResultTreeWidget as TheiaSearchInWorkspaceResultTreeWidget } from '@theia/search-in-workspace/lib/browser/search-in-workspace-result-tree-widget';
+import { SearchInWorkspaceResultTreeWidget } from './theia/search-in-workspace/search-in-workspace-result-tree-widget';
 import { MonacoEditorProvider } from './theia/monaco/monaco-editor-provider';
-import {
-  MonacoEditorFactory,
-  MonacoEditorProvider as TheiaMonacoEditorProvider,
-} from '@theia/monaco/lib/browser/monaco-editor-provider';
+import { MonacoEditorProvider as TheiaMonacoEditorProvider } from '@theia/monaco/lib/browser/monaco-editor-provider';
 import { StorageWrapper } from './storage-wrapper';
 import { NotificationManager } from './theia/messages/notifications-manager';
 import { NotificationManager as TheiaNotificationManager } from '@theia/messages/lib/browser/notifications-manager';
@@ -237,7 +234,9 @@ import { UploadFirmware } from './contributions/upload-firmware';
 import {
   UploadFirmwareDialog,
   UploadFirmwareDialogProps,
+  UploadFirmwareDialogWidget,
 } from './dialogs/firmware-uploader/firmware-uploader-dialog';
+
 import { UploadCertificate } from './contributions/upload-certificate';
 import {
   ArduinoFirmwareUploader,
@@ -252,6 +251,7 @@ import { PlotterFrontendContribution } from './serial/plotter/plotter-frontend-c
 import {
   UserFieldsDialog,
   UserFieldsDialogProps,
+  UserFieldsDialogWidget,
 } from './dialogs/user-fields/user-fields-dialog';
 import { nls } from '@theia/core/lib/common';
 import { IDEUpdaterCommands } from './ide-updater/ide-updater-commands';
@@ -264,105 +264,25 @@ import { IDEUpdaterClientImpl } from './ide-updater/ide-updater-client-impl';
 import {
   IDEUpdaterDialog,
   IDEUpdaterDialogProps,
+  IDEUpdaterDialogWidget,
 } from './dialogs/ide-updater/ide-updater-dialog';
 import { ElectronIpcConnectionProvider } from '@theia/core/lib/electron-browser/messaging/electron-ipc-connection-provider';
 import { MonitorModel } from './monitor-model';
 import { MonitorManagerProxyClientImpl } from './monitor-manager-proxy-client-impl';
-import { EditorManager as TheiaEditorManager } from '@theia/editor/lib/browser/editor-manager';
-import { EditorManager } from './theia/editor/editor-manager';
-import { HostedPluginEvents } from './hosted-plugin-events';
-import { HostedPluginSupport } from './theia/plugin-ext/hosted-plugin';
-import { HostedPluginSupport as TheiaHostedPluginSupport } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin';
-import { Formatter, FormatterPath } from '../common/protocol/formatter';
-import { Format } from './contributions/format';
-import { MonacoFormattingConflictsContribution } from './theia/monaco/monaco-formatting-conflicts';
-import { MonacoFormattingConflictsContribution as TheiaMonacoFormattingConflictsContribution } from '@theia/monaco/lib/browser/monaco-formatting-conflicts';
-import { DefaultJsonSchemaContribution } from './theia/core/json-schema-store';
-import { DefaultJsonSchemaContribution as TheiaDefaultJsonSchemaContribution } from '@theia/core/lib/browser/json-schema-store';
-import { EditorNavigationContribution } from './theia/editor/editor-navigation-contribution';
-import { EditorNavigationContribution as TheiaEditorNavigationContribution } from '@theia/editor/lib/browser/editor-navigation-contribution';
-import { PreferenceTreeGenerator } from './theia/preferences/preference-tree-generator';
-import { PreferenceTreeGenerator as TheiaPreferenceTreeGenerator } from '@theia/preferences/lib/browser/util/preference-tree-generator';
-import { AboutDialog } from './theia/core/about-dialog';
-import { AboutDialog as TheiaAboutDialog } from '@theia/core/lib/browser/about-dialog';
-import {
-  SurveyNotificationService,
-  SurveyNotificationServicePath,
-} from '../common/protocol/survey-service';
-import { WindowContribution } from './theia/core/window-contribution';
-import { WindowContribution as TheiaWindowContribution } from '@theia/core/lib/browser/window-contribution';
-import { CoreErrorHandler } from './contributions/core-error-handler';
-import { CompilerErrors } from './contributions/compiler-errors';
-import { WidgetManager } from './theia/core/widget-manager';
-import { WidgetManager as TheiaWidgetManager } from '@theia/core/lib/browser/widget-manager';
-import { StartupTasks } from './contributions/startup-task';
-import { IndexesUpdateProgress } from './contributions/indexes-update-progress';
-import { Daemon } from './contributions/daemon';
-import { FirstStartupInstaller } from './contributions/first-startup-installer';
-import { OpenSketchFiles } from './contributions/open-sketch-files';
-import { InoLanguage } from './contributions/ino-language';
-import { SelectedBoard } from './contributions/selected-board';
-import { CheckForIDEUpdates } from './contributions/check-for-ide-updates';
-import { OpenBoardsConfig } from './contributions/open-boards-config';
-import { SketchFilesTracker } from './contributions/sketch-files-tracker';
-import { EditorMenuContribution } from './theia/editor/editor-file';
-import { EditorMenuContribution as TheiaEditorMenuContribution } from '@theia/editor/lib/browser/editor-menu';
-import { PreferencesEditorWidget as TheiaPreferencesEditorWidget } from '@theia/preferences/lib/browser/views/preference-editor-widget';
-import { PreferencesEditorWidget } from './theia/preferences/preference-editor-widget';
-import { PreferencesWidget } from '@theia/preferences/lib/browser/views/preference-widget';
-import { createPreferencesWidgetContainer } from '@theia/preferences/lib/browser/views/preference-widget-bindings';
-import {
-  BoardsFilterRenderer,
-  LibraryFilterRenderer,
-} from './widgets/component-list/filter-renderer';
-import { CheckForUpdates } from './contributions/check-for-updates';
-import { OutputEditorFactory } from './theia/output/output-editor-factory';
-import { StartupTaskProvider } from '../electron-common/startup-task';
-import { DeleteSketch } from './contributions/delete-sketch';
-import { UserFields } from './contributions/user-fields';
-import { UpdateIndexes } from './contributions/update-indexes';
-import { InterfaceScale } from './contributions/interface-scale';
-import { OpenHandler } from '@theia/core/lib/browser/opener-service';
-import { NewCloudSketch } from './contributions/new-cloud-sketch';
-import { SketchbookCompositeWidget } from './widgets/sketchbook/sketchbook-composite-widget';
-import { WindowTitleUpdater } from './theia/core/window-title-updater';
-import { WindowTitleUpdater as TheiaWindowTitleUpdater } from '@theia/core/lib/browser/window/window-title-updater';
-import {
-  MonacoThemingService,
-  CleanupObsoleteThemes,
-  ThemesRegistrationSummary,
-  MonacoThemeRegistry,
-} from './theia/monaco/monaco-theming-service';
-import { MonacoThemeRegistry as TheiaMonacoThemeRegistry } from '@theia/monaco/lib/browser/textmate/monaco-theme-registry';
-import { MonacoThemingService as TheiaMonacoThemingService } from '@theia/monaco/lib/browser/monaco-theming-service';
-import { TypeHierarchyServiceProvider } from './theia/typehierarchy/type-hierarchy-service';
-import { TypeHierarchyServiceProvider as TheiaTypeHierarchyServiceProvider } from '@theia/typehierarchy/lib/browser/typehierarchy-service';
-import { TypeHierarchyContribution } from './theia/typehierarchy/type-hierarchy-contribution';
-import { TypeHierarchyContribution as TheiaTypeHierarchyContribution } from '@theia/typehierarchy/lib/browser/typehierarchy-contribution';
-import { DefaultDebugSessionFactory } from './theia/debug/debug-session-contribution';
-import { DebugSessionFactory } from '@theia/debug/lib/browser/debug-session-contribution';
-import { DebugToolbar } from './theia/debug/debug-toolbar-widget';
-import { DebugToolBar as TheiaDebugToolbar } from '@theia/debug/lib/browser/view/debug-toolbar-widget';
-import { PluginMenuCommandAdapter } from './theia/plugin-ext/plugin-menu-command-adapter';
-import { PluginMenuCommandAdapter as TheiaPluginMenuCommandAdapter } from '@theia/plugin-ext/lib/main/browser/menus/plugin-menu-command-adapter';
-import { DebugSessionManager } from './theia/debug/debug-session-manager';
-import { DebugSessionManager as TheiaDebugSessionManager } from '@theia/debug/lib/browser/debug-session-manager';
-import { DebugWidget } from '@theia/debug/lib/browser/view/debug-widget';
-import { DebugViewModel } from '@theia/debug/lib/browser/view/debug-view-model';
-import { DebugSessionWidget } from '@theia/debug/lib/browser/view/debug-session-widget';
-import { DebugConfigurationWidget } from '@theia/debug/lib/browser/view/debug-configuration-widget';
-import { ConfigServiceClient } from './config/config-service-client';
-import { ValidateSketch } from './contributions/validate-sketch';
-import { RenameCloudSketch } from './contributions/rename-cloud-sketch';
-import { CreateFeatures } from './create/create-features';
-import { Account } from './contributions/account';
-import { SidebarBottomMenuWidget } from './theia/core/sidebar-bottom-menu-widget';
-import { SidebarBottomMenuWidget as TheiaSidebarBottomMenuWidget } from '@theia/core/lib/browser/shell/sidebar-bottom-menu-widget';
-import { CreateCloudCopy } from './contributions/create-cloud-copy';
-import { FileResourceResolver } from './theia/filesystem/file-resource';
-import { FileResourceResolver as TheiaFileResourceResolver } from '@theia/filesystem/lib/browser/file-resource';
+
+const ElementQueries = require('css-element-queries/src/ElementQueries');
+
+MonacoThemingService.register({
+  id: 'arduino-theme',
+  label: 'Light (Arduino)',
+  uiTheme: 'vs',
+  json: require('../../src/browser/data/arduino.color-theme.json'),
+});
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
+  ElementQueries.listen();
+  ElementQueries.init();
+
   // Commands and toolbar items
   bind(ArduinoFrontendContribution).toSelf().inSingletonScope();
   bind(CommandContribution).toService(ArduinoFrontendContribution);
@@ -376,8 +296,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
   // Renderer for both the library and the core widgets.
   bind(ListItemRenderer).toSelf().inSingletonScope();
-  bind(LibraryFilterRenderer).toSelf().inSingletonScope();
-  bind(BoardsFilterRenderer).toSelf().inSingletonScope();
 
   // Library service
   bind(LibraryService)
@@ -399,7 +317,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(FrontendApplicationContribution).toService(
     LibraryListWidgetFrontendContribution
   );
-  bind(OpenHandler).toService(LibraryListWidgetFrontendContribution);
 
   // Sketch list service
   bind(SketchesService)
@@ -422,8 +339,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
       )
     )
     .inSingletonScope();
-  bind(ConfigServiceClient).toSelf().inSingletonScope();
-  bind(FrontendApplicationContribution).toService(ConfigServiceClient);
 
   // Boards service
   bind(BoardsService)
@@ -437,7 +352,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   // Boards service client to receive and delegate notifications from the backend.
   bind(BoardsServiceProvider).toSelf().inSingletonScope();
   bind(FrontendApplicationContribution).toService(BoardsServiceProvider);
-  bind(CommandContribution).toService(BoardsServiceProvider);
 
   // To be able to track, and update the menu based on the core settings (aka. board details) of the currently selected board.
   bind(FrontendApplicationContribution)
@@ -468,16 +382,12 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(FrontendApplicationContribution).toService(
     BoardsListWidgetFrontendContribution
   );
-  bind(OpenHandler).toService(BoardsListWidgetFrontendContribution);
 
   // Board select dialog
   bind(BoardsConfigDialogWidget).toSelf().inSingletonScope();
   bind(BoardsConfigDialog).toSelf().inSingletonScope();
   bind(BoardsConfigDialogProps).toConstantValue({
-    title: nls.localize(
-      'arduino/board/boardConfigDialogTitle',
-      'Select Other Board and Port'
-    ),
+    title: nls.localize('arduino/common/selectBoard', 'Select Board'),
   });
 
   // Core service
@@ -489,7 +399,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
       )
     )
     .inSingletonScope();
-  bind(CoreErrorHandler).toSelf().inSingletonScope();
 
   // Serial monitor
   bind(MonitorWidget).toSelf();
@@ -499,29 +408,24 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(TabBarToolbarContribution).toService(MonitorViewContribution);
   bind(WidgetFactory).toDynamicValue((context) => ({
     id: MonitorWidget.ID,
-    createWidget: () => context.container.get(MonitorWidget),
+    createWidget: () => {
+      return new MonitorWidget(
+        context.container.get<MonitorModel>(MonitorModel),
+        context.container.get<MonitorManagerProxyClient>(MonitorManagerProxyClient),
+        context.container.get<BoardsServiceProvider>(BoardsServiceProvider),
+      );
+    }
   }));
 
-  bind(MonitorManagerProxyFactory).toFactory(
-    (context) => () =>
-      context.container.get<MonitorManagerProxy>(MonitorManagerProxy)
-  );
+  bind(MonitorManagerProxyFactory).toFactory((context) => () => context.container.get<MonitorManagerProxy>(MonitorManagerProxy))
 
-  bind(MonitorManagerProxy)
-    .toDynamicValue((context) =>
-      WebSocketConnectionProvider.createProxy(
-        context.container,
-        MonitorManagerProxyPath,
-        context.container.get(MonitorManagerProxyClient)
-      )
-    )
-    .inSingletonScope();
+  bind(MonitorManagerProxy).toDynamicValue((context) =>
+    WebSocketConnectionProvider.createProxy(context.container, MonitorManagerProxyPath, context.container.get(MonitorManagerProxyClient))
+  ).inSingletonScope();
 
   // Monitor manager proxy client to receive and delegate pluggable monitors
   // notifications from the backend
-  bind(MonitorManagerProxyClient)
-    .to(MonitorManagerProxyClientImpl)
-    .inSingletonScope();
+  bind(MonitorManagerProxyClient).to(MonitorManagerProxyClientImpl).inSingletonScope();
 
   bind(WorkspaceService).toSelf().inSingletonScope();
   rebind(TheiaWorkspaceService).toService(WorkspaceService);
@@ -530,14 +434,9 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     WorkspaceVariableContribution
   );
 
-  bind(SurveyNotificationService)
-    .toDynamicValue((context) => {
-      return ElectronIpcConnectionProvider.createProxy(
-        context.container,
-        SurveyNotificationServicePath
-      );
-    })
-    .inSingletonScope();
+  // Customizing default Theia layout based on the editor mode: `pro-mode` or `classic`.
+  bind(EditorMode).toSelf().inSingletonScope();
+  bind(FrontendApplicationContribution).toService(EditorMode);
 
   // Layout and shell customizations.
   rebind(TheiaOutlineViewContribution)
@@ -550,7 +449,9 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   rebind(TheiaKeymapsFrontendContribution)
     .to(KeymapsFrontendContribution)
     .inSingletonScope();
-  rebind(TheiaEditorContribution).to(EditorContribution).inSingletonScope();
+  rebind(TheiaEditorPreviewContribution)
+    .to(EditorPreviewContribution)
+    .inSingletonScope();
   rebind(TheiaMonacoStatusBarContribution)
     .to(MonacoStatusBarContribution)
     .inSingletonScope();
@@ -572,6 +473,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   rebind(TheiaPreferencesContribution)
     .to(PreferencesContribution)
     .inSingletonScope();
+  rebind(TheiaKeybindingRegistry).to(KeybindingRegistry).inSingletonScope();
   rebind(TheiaWorkspaceCommandContribution)
     .to(WorkspaceCommandContribution)
     .inSingletonScope();
@@ -579,6 +481,15 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     .to(WorkspaceDeleteHandler)
     .inSingletonScope();
   rebind(TheiaEditorWidgetFactory).to(EditorWidgetFactory).inSingletonScope();
+  rebind(TabBarToolbarFactory).toFactory(
+    ({ container: parentContainer }) => () => {
+      const container = parentContainer.createChild();
+      container.bind(TabBarToolbar).toSelf().inSingletonScope();
+      return container.get(TabBarToolbar);
+    }
+  );
+  bind(OutputWidget).toSelf().inSingletonScope();
+  rebind(TheiaOutputWidget).toService(OutputWidget);
   bind(OutputChannelManager).toSelf().inSingletonScope();
   rebind(TheiaOutputChannelManager).toService(OutputChannelManager);
   bind(OutputChannelRegistryMainImpl).toSelf().inTransientScope();
@@ -590,15 +501,25 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(MonacoEditorProvider).toSelf().inSingletonScope();
   rebind(TheiaMonacoEditorProvider).toService(MonacoEditorProvider);
 
-  // Disabled reference counter in the editor manager to avoid opening the same editor (with different opener options) multiple times.
-  bind(EditorManager).toSelf().inSingletonScope();
-  rebind(TheiaEditorManager).toService(EditorManager);
+  bind(SearchInWorkspaceWidget).toSelf();
+  rebind(TheiaSearchInWorkspaceWidget).toService(SearchInWorkspaceWidget);
 
   // replace search icon
   rebind(TheiaSearchInWorkspaceFactory)
     .to(SearchInWorkspaceFactory)
     .inSingletonScope();
 
+  rebind(TheiaSearchInWorkspaceResultTreeWidget).toDynamicValue(
+    ({ container }) => {
+      const childContainer = createTreeContainer(container);
+      childContainer.bind(SearchInWorkspaceResultTreeWidget).toSelf();
+      childContainer
+        .rebind(TreeWidget)
+        .toService(SearchInWorkspaceResultTreeWidget);
+      return childContainer.get(SearchInWorkspaceResultTreeWidget);
+    }
+  );
+
   // Show a disconnected status bar, when the daemon is not available
   bind(ApplicationConnectionStatusContribution).toSelf().inSingletonScope();
   rebind(TheiaApplicationConnectionStatusContribution).toService(
@@ -625,19 +546,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(OutputToolbarContribution).toSelf().inSingletonScope();
   rebind(TheiaOutputToolbarContribution).toService(OutputToolbarContribution);
 
-  // To remove `New Window` from the `File` menu
-  bind(WindowContribution).toSelf().inSingletonScope();
-  rebind(TheiaWindowContribution).toService(WindowContribution);
-
-  // To remove `File` > `Close Editor`.
-  bind(EditorMenuContribution).toSelf().inSingletonScope();
-  rebind(TheiaEditorMenuContribution).toService(EditorMenuContribution);
-
-  // To disable the highlighting of non-unicode characters in the _Output_ view
-  bind(OutputEditorFactory).toSelf().inSingletonScope();
-  // Rebind to `TheiaOutputEditorFactory` when https://github.com/eclipse-theia/theia/pull/11615 is available.
-  rebind(MonacoEditorFactory).toService(OutputEditorFactory);
-
   bind(ArduinoDaemon)
     .toDynamicValue((context) =>
       WebSocketConnectionProvider.createProxy(
@@ -647,12 +555,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     )
     .inSingletonScope();
 
-  bind(Formatter)
-    .toDynamicValue(({ container }) =>
-      WebSocketConnectionProvider.createProxy(container, FormatterPath)
-    )
-    .inSingletonScope();
-
   bind(ArduinoFirmwareUploader)
     .toDynamicValue((context) =>
       WebSocketConnectionProvider.createProxy(
@@ -703,7 +605,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, EditContributions);
   Contribution.configure(bind, QuitApp);
   Contribution.configure(bind, SketchControl);
-  Contribution.configure(bind, OpenSettings);
+  Contribution.configure(bind, Settings);
   Contribution.configure(bind, BurnBootloader);
   Contribution.configure(bind, BuiltInExamples);
   Contribution.configure(bind, LibraryExamples);
@@ -720,39 +622,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   Contribution.configure(bind, ArchiveSketch);
   Contribution.configure(bind, AddZipLibrary);
   Contribution.configure(bind, PlotterFrontendContribution);
-  Contribution.configure(bind, Format);
-  Contribution.configure(bind, CompilerErrors);
-  Contribution.configure(bind, StartupTasks);
-  Contribution.configure(bind, IndexesUpdateProgress);
-  Contribution.configure(bind, Daemon);
-  Contribution.configure(bind, FirstStartupInstaller);
-  Contribution.configure(bind, OpenSketchFiles);
-  Contribution.configure(bind, InoLanguage);
-  Contribution.configure(bind, SelectedBoard);
-  Contribution.configure(bind, CheckForIDEUpdates);
-  Contribution.configure(bind, OpenBoardsConfig);
-  Contribution.configure(bind, SketchFilesTracker);
-  Contribution.configure(bind, CheckForUpdates);
-  Contribution.configure(bind, UserFields);
-  Contribution.configure(bind, DeleteSketch);
-  Contribution.configure(bind, UpdateIndexes);
-  Contribution.configure(bind, InterfaceScale);
-  Contribution.configure(bind, NewCloudSketch);
-  Contribution.configure(bind, ValidateSketch);
-  Contribution.configure(bind, RenameCloudSketch);
-  Contribution.configure(bind, Account);
-  Contribution.configure(bind, CloudSketchbookContribution);
-  Contribution.configure(bind, CreateCloudCopy);
-
-  bindContributionProvider(bind, StartupTaskProvider);
-  bind(StartupTaskProvider).toService(BoardsServiceProvider); // to reuse the boards config in another window
-
-  // Disabled the quick-pick customization from Theia when multiple formatters are available.
-  // Use the default VS Code behavior, and pick the first one. In the IDE2, clang-format has `exclusive` selectors.
-  bind(MonacoFormattingConflictsContribution).toSelf().inSingletonScope();
-  rebind(TheiaMonacoFormattingConflictsContribution).toService(
-    MonacoFormattingConflictsContribution
-  );
 
   bind(ResponseServiceImpl)
     .toSelf()
@@ -767,7 +636,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     });
 
   bind(ResponseService).toService(ResponseServiceImpl);
-  bind(ResponseServiceClient).toService(ResponseServiceImpl);
+  bind(ResponseServiceArduino).toService(ResponseServiceImpl);
 
   bind(NotificationCenter).toSelf().inSingletonScope();
   bind(FrontendApplicationContribution).toService(NotificationCenter);
@@ -782,13 +651,15 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
   // Enable the dirty indicator on uncloseable widgets.
   rebind(TabBarRendererFactory).toFactory((context) => () => {
-    const contextMenuRenderer =
-      context.container.get<ContextMenuRenderer>(ContextMenuRenderer);
+    const contextMenuRenderer = context.container.get<ContextMenuRenderer>(
+      ContextMenuRenderer
+    );
     const decoratorService = context.container.get<TabBarDecoratorService>(
       TabBarDecoratorService
     );
-    const iconThemeService =
-      context.container.get<IconThemeService>(IconThemeService);
+    const iconThemeService = context.container.get<IconThemeService>(
+      IconThemeService
+    );
     return new TabBarRenderer(
       contextMenuRenderer,
       decoratorService,
@@ -798,8 +669,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
   // Workaround for https://github.com/eclipse-theia/theia/issues/8722
   // Do not trigger a save on IDE startup if `"editor.autoSave": "on"` was set as a preference.
-  // Note: `"editor.autoSave" was renamed to `"files.autoSave" and `"on"` was replaced with three
-  // different cases, but we treat `!== 'off'` as auto save enabled. (https://github.com/eclipse-theia/theia/issues/10812)
   bind(EditorCommandContribution).toSelf().inSingletonScope();
   rebind(TheiaEditorCommandContribution).toService(EditorCommandContribution);
 
@@ -807,26 +676,9 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(NavigatorTabBarDecorator).toSelf().inSingletonScope();
   rebind(TheiaNavigatorTabBarDecorator).toService(NavigatorTabBarDecorator);
 
-  // Do not fetch the `catalog.json` from Azure on FE load.
-  bind(DefaultJsonSchemaContribution).toSelf().inSingletonScope();
-  rebind(TheiaDefaultJsonSchemaContribution).toService(
-    DefaultJsonSchemaContribution
-  );
-
-  // Do not block the app startup when initializing the editor navigation history.
-  bind(EditorNavigationContribution).toSelf().inSingletonScope();
-  rebind(TheiaEditorNavigationContribution).toService(
-    EditorNavigationContribution
-  );
-
-  // IDE2 does not use the Theia preferences widget, no need to create and sync the underlying tree model.
-  bind(PreferenceTreeGenerator).toSelf().inSingletonScope();
-  rebind(TheiaPreferenceTreeGenerator).toService(PreferenceTreeGenerator);
-
-  // IDE2 has a custom about dialog, so there is no need to load the Theia extensions on FE load
-  bind(AboutDialog).toSelf().inSingletonScope();
-  rebind(TheiaAboutDialog).toService(AboutDialog);
-
+  // To avoid running `Save All` when there are no dirty editors before starting the debug session.
+  bind(DebugSessionManager).toSelf().inSingletonScope();
+  rebind(TheiaDebugSessionManager).toService(DebugSessionManager);
   // To remove the `Run` menu item from the application menu.
   bind(DebugFrontendApplicationContribution).toSelf().inSingletonScope();
   rebind(TheiaDebugFrontendApplicationContribution).toService(
@@ -836,26 +688,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(DebugConfigurationManager).toSelf().inSingletonScope();
   rebind(TheiaDebugConfigurationManager).toService(DebugConfigurationManager);
 
-  // To avoid duplicate tabs use deepEqual instead of string equal: https://github.com/eclipse-theia/theia/issues/11309
-  bind(WidgetManager).toSelf().inSingletonScope();
-  rebind(TheiaWidgetManager).toService(WidgetManager);
-
-  // Debounced update for the tab-bar toolbar when typing in the editor.
-  bind(DockPanelRenderer).toSelf();
-  rebind(TheiaDockPanelRenderer).toService(DockPanelRenderer);
-
-  // Avoid running the "reset scroll" interval tasks until the preference editor opens.
-  rebind(PreferencesWidget)
-    .toDynamicValue(({ container }) => {
-      const child = createPreferencesWidgetContainer(container);
-      child.bind(PreferencesEditorWidget).toSelf().inSingletonScope();
-      child
-        .rebind(TheiaPreferencesEditorWidget)
-        .toService(PreferencesEditorWidget);
-      return child.get(PreferencesWidget);
-    })
-    .inSingletonScope();
-
   // Preferences
   bindArduinoPreferences(bind);
 
@@ -890,11 +722,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     id: 'arduino-sketchbook-widget',
     createWidget: () => container.get(SketchbookWidget),
   }));
-  bind(SketchbookCompositeWidget).toSelf();
-  bind<WidgetFactory>(WidgetFactory).toDynamicValue((ctx) => ({
-    id: 'sketchbook-composite-widget',
-    createWidget: () => ctx.container.get(SketchbookCompositeWidget),
-  }));
 
   bind(CloudSketchbookWidget).toSelf();
   rebind(SketchbookWidget).toService(CloudSketchbookWidget);
@@ -903,8 +730,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   );
   bind(CreateApi).toSelf().inSingletonScope();
   bind(SketchCache).toSelf().inSingletonScope();
-  bind(CreateFeatures).toSelf().inSingletonScope();
-  bind(FrontendApplicationContribution).toService(CreateFeatures);
 
   bind(ShareSketchDialog).toSelf().inSingletonScope();
   bind(AuthenticationClientService).toSelf().inSingletonScope();
@@ -921,14 +746,17 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(CreateFsProvider).toSelf().inSingletonScope();
   bind(FrontendApplicationContribution).toService(CreateFsProvider);
   bind(FileServiceContribution).toService(CreateFsProvider);
+  bind(CloudSketchbookContribution).toSelf().inSingletonScope();
+  bind(CommandContribution).toService(CloudSketchbookContribution);
   bind(LocalCacheFsProvider).toSelf().inSingletonScope();
   bind(FileServiceContribution).toService(LocalCacheFsProvider);
   bind(CloudSketchbookCompositeWidget).toSelf();
-  bind(WidgetFactory).toDynamicValue((ctx) => ({
+  bind<WidgetFactory>(WidgetFactory).toDynamicValue((ctx) => ({
     id: 'cloud-sketchbook-composite-widget',
     createWidget: () => ctx.container.get(CloudSketchbookCompositeWidget),
   }));
 
+  bind(UploadFirmwareDialogWidget).toSelf().inSingletonScope();
   bind(UploadFirmwareDialog).toSelf().inSingletonScope();
   bind(UploadFirmwareDialogProps).toConstantValue({
     title: 'UploadFirmware',
@@ -939,11 +767,13 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     title: 'UploadCertificate',
   });
 
+  bind(IDEUpdaterDialogWidget).toSelf().inSingletonScope();
   bind(IDEUpdaterDialog).toSelf().inSingletonScope();
   bind(IDEUpdaterDialogProps).toConstantValue({
     title: 'IDEUpdater',
   });
 
+  bind(UserFieldsDialogWidget).toSelf().inSingletonScope();
   bind(UserFieldsDialog).toSelf().inSingletonScope();
   bind(UserFieldsDialogProps).toConstantValue({
     title: 'UserFields',
@@ -965,82 +795,4 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
       );
     })
     .inSingletonScope();
-
-  bind(HostedPluginSupport).toSelf().inSingletonScope();
-  rebind(TheiaHostedPluginSupport).toService(HostedPluginSupport);
-  bind(HostedPluginEvents).toSelf().inSingletonScope();
-  bind(FrontendApplicationContribution).toService(HostedPluginEvents);
-
-  // custom window titles
-  bind(WindowTitleUpdater).toSelf().inSingletonScope();
-  rebind(TheiaWindowTitleUpdater).toService(WindowTitleUpdater);
-
-  // register Arduino themes
-  bind(MonacoThemingService).toSelf().inSingletonScope();
-  rebind(TheiaMonacoThemingService).toService(MonacoThemingService);
-
-  // workaround for themes cannot be removed after registration
-  // https://github.com/eclipse-theia/theia/issues/11151
-  bind(CleanupObsoleteThemes).toSelf().inSingletonScope();
-  bind(FrontendApplicationContribution).toService(
-    CleanupObsoleteThemes
-  );
-  bind(ThemesRegistrationSummary).toSelf().inSingletonScope();
-  bind(MonacoThemeRegistry).toSelf().inSingletonScope();
-  rebind(TheiaMonacoThemeRegistry).toService(MonacoThemeRegistry);
-
-  // disable type-hierarchy support
-  // https://github.com/eclipse-theia/theia/commit/16c88a584bac37f5cf3cc5eb92ffdaa541bda5be
-  bind(TypeHierarchyServiceProvider).toSelf().inSingletonScope();
-  rebind(TheiaTypeHierarchyServiceProvider).toService(
-    TypeHierarchyServiceProvider
-  );
-  bind(TypeHierarchyContribution).toSelf().inSingletonScope();
-  rebind(TheiaTypeHierarchyContribution).toService(TypeHierarchyContribution);
-
-  // patched the debugger for `cortex-debug@1.5.1`
-  // https://github.com/eclipse-theia/theia/issues/11871
-  // https://github.com/eclipse-theia/theia/issues/11879
-  // https://github.com/eclipse-theia/theia/issues/11880
-  // https://github.com/eclipse-theia/theia/issues/11885
-  // https://github.com/eclipse-theia/theia/issues/11886
-  // https://github.com/eclipse-theia/theia/issues/11916
-  // based on: https://github.com/eclipse-theia/theia/compare/master...kittaakos:theia:%2311871
-  bind(DefaultDebugSessionFactory).toSelf().inSingletonScope();
-  rebind(DebugSessionFactory).toService(DefaultDebugSessionFactory);
-  bind(DebugSessionManager).toSelf().inSingletonScope();
-  rebind(TheiaDebugSessionManager).toService(DebugSessionManager);
-  bind(DebugToolbar).toSelf().inSingletonScope();
-  rebind(TheiaDebugToolbar).toService(DebugToolbar);
-  bind(PluginMenuCommandAdapter).toSelf().inSingletonScope();
-  rebind(TheiaPluginMenuCommandAdapter).toService(PluginMenuCommandAdapter);
-  bind(WidgetFactory)
-    .toDynamicValue(({ container }) => ({
-      id: DebugWidget.ID,
-      createWidget: () => {
-        const child = new Container({ defaultScope: 'Singleton' });
-        child.parent = container;
-        child.bind(DebugViewModel).toSelf();
-        child.bind(DebugToolbar).toSelf(); // patched toolbar
-        child.bind(DebugSessionWidget).toSelf();
-        child.bind(DebugConfigurationWidget).toSelf();
-        child.bind(DebugWidget).toSelf();
-        return child.get(DebugWidget);
-      },
-    }))
-    .inSingletonScope();
-
-  bind(SidebarBottomMenuWidget).toSelf();
-  rebind(TheiaSidebarBottomMenuWidget).toService(SidebarBottomMenuWidget);
-
-  bind(ArduinoComponentContextMenuRenderer).toSelf().inSingletonScope();
-
-  bind(DaemonPort).toSelf().inSingletonScope();
-  bind(FrontendApplicationContribution).toService(DaemonPort);
-  bind(IsOnline).toSelf().inSingletonScope();
-  bind(FrontendApplicationContribution).toService(IsOnline);
-
-  // https://github.com/arduino/arduino-ide/issues/437
-  bind(FileResourceResolver).toSelf().inSingletonScope();
-  rebind(TheiaFileResourceResolver).toService(FileResourceResolver);
 });

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

@@ -1,4 +1,4 @@
-import { interfaces } from '@theia/core/shared/inversify';
+import { interfaces } from 'inversify';
 import {
   createPreferenceProxy,
   PreferenceProxy,
@@ -13,32 +13,6 @@ export enum UpdateChannel {
   Stable = 'stable',
   Nightly = 'nightly',
 }
-export const ErrorRevealStrategyLiterals = [
-  /**
-   * Scroll vertically as necessary and reveal a line.
-   */
-  'auto',
-  /**
-   * Scroll vertically as necessary and reveal a line centered vertically.
-   */
-  'center',
-  /**
-   * Scroll vertically as necessary and reveal a line close to the top of the viewport, optimized for viewing a code definition.
-   */
-  'top',
-  /**
-   * Scroll vertically as necessary and reveal a line centered vertically only if it lies outside the viewport.
-   */
-  'centerIfOutsideViewport',
-] as const;
-export type ErrorRevealStrategy = typeof ErrorRevealStrategyLiterals[number];
-export namespace ErrorRevealStrategy {
-  // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types, @typescript-eslint/no-explicit-any
-  export function is(arg: any): arg is ErrorRevealStrategy {
-    return !!arg && ErrorRevealStrategyLiterals.includes(arg);
-  }
-  export const Default: ErrorRevealStrategy = 'centerIfOutsideViewport';
-}
 
 export const ArduinoConfigSchema: PreferenceSchema = {
   type: 'object',
@@ -51,14 +25,6 @@ export const ArduinoConfigSchema: PreferenceSchema = {
       ),
       default: false,
     },
-    'arduino.language.realTimeDiagnostics': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/language.realTimeDiagnostics',
-        "If true, the language server provides real-time diagnostics when typing in the editor. It's false by default."
-      ),
-      default: false,
-    },
     'arduino.compile.verbose': {
       type: 'boolean',
       description: nls.localize(
@@ -67,23 +33,6 @@ export const ArduinoConfigSchema: PreferenceSchema = {
       ),
       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(
@@ -114,12 +63,11 @@ export const ArduinoConfigSchema: PreferenceSchema = {
     },
     'arduino.window.zoomLevel': {
       type: 'number',
-      description: '',
-      default: 0,
-      deprecationMessage: nls.localize(
-        'arduino/preferences/window.zoomLevel/deprecationMessage',
-        "Deprecated. Use 'window.zoomLevel' instead."
+      description: nls.localize(
+        'arduino/preferences/window.zoomLevel',
+        'Adjust the zoom level of the window. The original size is 0 and each increment above (e.g. 1) or below (e.g. -1) represents zooming 20% larger or smaller. You can also enter decimals to adjust the zoom level with a finer granularity.'
       ),
+      default: 0,
     },
     'arduino.ide.updateChannel': {
       type: 'string',
@@ -135,7 +83,7 @@ export const ArduinoConfigSchema: PreferenceSchema = {
       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'"
+        `The base URL where to download updates from. Defaults to 'https://downloads.arduino.cc/arduino-ide'`
       ),
     },
     'arduino.board.certificates': {
@@ -186,10 +134,10 @@ export const ArduinoConfigSchema: PreferenceSchema = {
       ),
       default: true,
     },
-    'arduino.cloud.sketchSyncEndpoint': {
+    'arduino.cloud.sketchSyncEnpoint': {
       type: 'string',
       description: nls.localize(
-        'arduino/preferences/cloud.sketchSyncEndpoint',
+        'arduino/preferences/cloud.sketchSyncEnpoint',
         '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',
@@ -226,51 +174,17 @@ export const ArduinoConfigSchema: PreferenceSchema = {
       ),
       default: 'https://auth.arduino.cc/login#/register',
     },
-    'arduino.survey.notification': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/survey.notification',
-        'True if users should be notified if a survey is available. True by default.'
-      ),
-      default: true,
-    },
-    'arduino.cli.daemon.debug': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/cli.daemonDebug',
-        "Enable debug logging of the gRPC calls to the Arduino CLI. A restart of the IDE is needed for this setting to take effect. It's false by default."
-      ),
-      default: false,
-    },
-    'arduino.checkForUpdates': {
-      type: 'boolean',
-      description: nls.localize(
-        'arduino/preferences/checkForUpdate',
-        "Receive notifications of available updates for the IDE, boards, and libraries. Requires an IDE restart after change. It's true by default."
-      ),
-      default: true,
-    },
-    'arduino.sketch.inoBlueprint': {
-      type: 'string',
-      markdownDescription: nls.localize(
-        'arduino/preferences/sketch/inoBlueprint',
-        'Absolute filesystem path to the default `.ino` blueprint file. If specified, the content of the blueprint file will be used for every new sketch created by the IDE. The sketches will be generated with the default Arduino content if not specified. Unaccessible blueprint files are ignored. **A restart of the IDE is needed** for this setting to take effect.'
-      ),
-      default: undefined,
-    },
   },
 };
 
 export interface ArduinoConfiguration {
   'arduino.language.log': boolean;
-  'arduino.language.realTimeDiagnostics': boolean;
   'arduino.compile.verbose': boolean;
-  'arduino.compile.experimental': boolean;
-  'arduino.compile.revealRange': ErrorRevealStrategy;
   'arduino.compile.warnings': CompilerWarnings;
   'arduino.upload.verbose': boolean;
   'arduino.upload.verify': boolean;
   'arduino.window.autoScale': boolean;
+  'arduino.window.zoomLevel': number;
   'arduino.ide.updateChannel': UpdateChannel;
   'arduino.ide.updateBaseUrl': string;
   'arduino.board.certificates': string;
@@ -279,15 +193,11 @@ export interface ArduinoConfiguration {
   'arduino.cloud.pull.warn': boolean;
   'arduino.cloud.push.warn': boolean;
   'arduino.cloud.pushpublic.warn': boolean;
-  'arduino.cloud.sketchSyncEndpoint': string;
+  'arduino.cloud.sketchSyncEnpoint': string;
   'arduino.auth.clientID': string;
   'arduino.auth.domain': string;
   'arduino.auth.audience': string;
   'arduino.auth.registerUri': string;
-  'arduino.survey.notification': boolean;
-  'arduino.cli.daemon.debug': boolean;
-  'arduino.sketch.inoBlueprint': string;
-  'arduino.checkForUpdates': boolean;
 }
 
 export const ArduinoPreferences = Symbol('ArduinoPreferences');

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

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

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

@@ -1,4 +1,4 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from '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';
@@ -43,15 +43,13 @@ export class AuthenticationClientService
 
   readonly onSessionDidChange = this.onSessionDidChangeEmitter.event;
 
-  async onStart(): Promise<void> {
+  onStart(): 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.setOptions();
     this.arduinoPreferences.onPreferenceChanged((event) => {
       if (event.preferenceName.startsWith('arduino.auth.')) {
         this.setOptions();
@@ -59,8 +57,8 @@ export class AuthenticationClientService
     });
   }
 
-  setOptions(): Promise<void> {
-    return this.service.setOptions({
+  setOptions(): void {
+    this.service.setOptions({
       redirectUri: `http://localhost:${serverPort}/callback`,
       responseType: 'code',
       clientID: this.arduinoPreferences['arduino.auth.clientID'],
@@ -83,13 +81,9 @@ export class AuthenticationClientService
   registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(CloudUserCommands.LOGIN, {
       execute: () => this.service.login(),
-      isEnabled: () => !this._session,
-      isVisible: () => !this._session,
     });
     registry.registerCommand(CloudUserCommands.LOGOUT, {
       execute: () => this.service.logout(),
-      isEnabled: () => !!this._session,
-      isVisible: () => !!this._session,
     });
   }
 

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

@@ -1,8 +1,5 @@
 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(
     {
@@ -19,4 +16,9 @@ export namespace CloudUserCommands {
     },
     'arduino/cloud/signOut'
   );
+
+  export const OPEN_PROFILE_CONTEXT_MENU: Command = {
+    id: 'arduino-cloud-sketchbook--open-profile-menu',
+    label: 'Contextual menu',
+  };
 }

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

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

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

@@ -1,5 +1,5 @@
-import * as React from '@theia/core/shared/react';
-import { injectable, inject } from '@theia/core/shared/inversify';
+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';
@@ -55,13 +55,12 @@ export class BoardsConfigDialogWidget extends ReactWidget {
           onConfigChange={this.fireConfigChanged}
           onFocusNodeSet={this.setFocusNode}
           onFilteredTextDidChangeEvent={this.onFilterTextDidChangeEmitter.event}
-          onAppStateDidChange={this.notificationCenter.onAppStateDidChange}
         />
       </div>
     );
   }
 
-  protected override onActivateRequest(msg: Message): void {
+  protected onActivateRequest(msg: Message): void {
     super.onActivateRequest(msg);
     if (this.focusNode instanceof HTMLInputElement) {
       this.focusNode.select();

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

@@ -1,9 +1,5 @@
-import {
-  injectable,
-  inject,
-  postConstruct,
-} from '@theia/core/shared/inversify';
-import { Message } from '@theia/core/shared/@phosphor/messaging';
+import { injectable, inject, postConstruct } from 'inversify';
+import { Message } from '@phosphor/messaging';
 import { DialogProps, Widget, DialogError } from '@theia/core/lib/browser';
 import { AbstractDialog } from '../theia/dialogs/dialogs';
 import { BoardsConfig } from './boards-config';
@@ -30,11 +26,10 @@ export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
 
   constructor(
     @inject(BoardsConfigDialogProps)
-    protected override readonly props: BoardsConfigDialogProps
+    protected readonly props: BoardsConfigDialogProps
   ) {
-    super({ ...props, maxWidth: 500 });
+    super(props);
 
-    this.node.id = 'select-board-dialog-container';
     this.contentNode.classList.add('select-board-dialog');
     this.contentNode.appendChild(this.createDescription());
 
@@ -57,7 +52,7 @@ export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
   /**
    * Pass in an empty string if you want to reset the search term. Using `undefined` has no effect.
    */
-  override async open(
+  async open(
     query: string | undefined = undefined
   ): Promise<BoardsConfig.Config | undefined> {
     if (typeof query === 'string') {
@@ -70,6 +65,14 @@ export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
     const head = document.createElement('div');
     head.classList.add('head');
 
+    const title = document.createElement('div');
+    title.textContent = nls.localize(
+      'arduino/board/configDialogTitle',
+      'Select Other Board & Port'
+    );
+    title.classList.add('title');
+    head.appendChild(title);
+
     const text = document.createElement('div');
     text.classList.add('text');
     head.appendChild(text);
@@ -92,7 +95,7 @@ export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
     return head;
   }
 
-  protected override onAfterAttach(msg: Message): void {
+  protected onAfterAttach(msg: Message): void {
     if (this.widget.isAttached) {
       Widget.detach(this.widget);
     }
@@ -107,23 +110,23 @@ export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
     this.update();
   }
 
-  protected override onUpdateRequest(msg: Message): void {
+  protected onUpdateRequest(msg: Message) {
     super.onUpdateRequest(msg);
     this.widget.update();
   }
 
-  protected override onActivateRequest(msg: Message): void {
+  protected onActivateRequest(msg: Message): void {
     super.onActivateRequest(msg);
     this.widget.activate();
   }
 
-  protected override handleEnter(event: KeyboardEvent): boolean | void {
+  protected handleEnter(event: KeyboardEvent): boolean | void {
     if (event.target instanceof HTMLTextAreaElement) {
       return false;
     }
   }
 
-  protected override isValid(value: BoardsConfig.Config): DialogError {
+  protected isValid(value: BoardsConfig.Config): DialogError {
     if (!value.selectedBoard) {
       if (value.selectedPort) {
         return nls.localize(

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

@@ -1,4 +1,4 @@
-import * as React from '@theia/core/shared/react';
+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';
@@ -6,7 +6,7 @@ import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import {
   Board,
   Port,
-  BoardConfig as ProtocolBoardConfig,
+  AttachedBoardsChangeEvent,
   BoardWithPackage,
 } from '../../common/protocol/boards-service';
 import { NotificationCenter } from '../notification-center';
@@ -16,10 +16,12 @@ import {
 } from './boards-service-provider';
 import { naturalCompare } from '../../common/utils';
 import { nls } from '@theia/core/lib/common';
-import { FrontendApplicationState } from '@theia/core/lib/common/frontend-application-state';
 
 export namespace BoardsConfig {
-  export type Config = ProtocolBoardConfig;
+  export interface Config {
+    selectedBoard?: Board;
+    selectedPort?: Port;
+  }
 
   export interface Props {
     readonly boardsServiceProvider: BoardsServiceProvider;
@@ -27,7 +29,6 @@ export namespace BoardsConfig {
     readonly onConfigChange: (config: Config) => void;
     readonly onFocusNodeSet: (element: HTMLElement | undefined) => void;
     readonly onFilteredTextDidChangeEvent: Event<string>;
-    readonly onAppStateDidChange: Event<FrontendApplicationState>;
   }
 
   export interface State extends Config {
@@ -46,7 +47,7 @@ export abstract class Item<T> extends React.Component<{
   missing?: boolean;
   details?: string;
 }> {
-  override render(): React.ReactNode {
+  render(): React.ReactNode {
     const { selected, label, missing, details } = this.props;
     const classNames = ['item'];
     if (selected) {
@@ -98,26 +99,19 @@ export class BoardsConfig extends React.Component<
     };
   }
 
-  override componentDidMount(): void {
+  componentDidMount() {
+    this.updateBoards();
+    this.updatePorts(
+      this.props.boardsServiceProvider.availableBoards
+        .map(({ port }) => port)
+        .filter(notEmpty)
+    );
     this.toDispose.pushAll([
-      this.props.onAppStateDidChange((state) => {
-        if (state === 'ready') {
-          this.updateBoards();
-          this.updatePorts(
-            this.props.boardsServiceProvider.availableBoards
-              .map(({ port }) => port)
-              .filter(notEmpty)
-          );
-        }
-      }),
-      this.props.boardsServiceProvider.onAvailablePortsChanged(
-        ({ newState, oldState }) => {
-          const removedPorts = oldState.filter(
-            (oldPort) =>
-              !newState.find((newPort) => Port.sameAs(newPort, oldPort))
-          );
-          this.updatePorts(newState, removedPorts);
-        }
+      this.props.notificationCenter.onAttachedBoardsChanged((event) =>
+        this.updatePorts(
+          event.newState.ports,
+          AttachedBoardsChangeEvent.diff(event).detached.ports
+        )
       ),
       this.props.boardsServiceProvider.onBoardsConfigChanged(
         ({ selectedBoard, selectedPort }) => {
@@ -126,19 +120,19 @@ export class BoardsConfig extends React.Component<
           );
         }
       ),
-      this.props.notificationCenter.onPlatformDidInstall(() =>
+      this.props.notificationCenter.onPlatformInstalled(() =>
         this.updateBoards(this.state.query)
       ),
-      this.props.notificationCenter.onPlatformDidUninstall(() =>
+      this.props.notificationCenter.onPlatformUninstalled(() =>
         this.updateBoards(this.state.query)
       ),
-      this.props.notificationCenter.onIndexUpdateDidComplete(() =>
+      this.props.notificationCenter.onIndexUpdated(() =>
         this.updateBoards(this.state.query)
       ),
-      this.props.notificationCenter.onDaemonDidStart(() =>
+      this.props.notificationCenter.onDaemonStarted(() =>
         this.updateBoards(this.state.query)
       ),
-      this.props.notificationCenter.onDaemonDidStop(() =>
+      this.props.notificationCenter.onDaemonStopped(() =>
         this.setState({ searchResults: [] })
       ),
       this.props.onFilteredTextDidChangeEvent((query) =>
@@ -147,11 +141,11 @@ export class BoardsConfig extends React.Component<
     ]);
   }
 
-  override componentWillUnmount(): void {
+  componentWillUnmount(): void {
     this.toDispose.dispose();
   }
 
-  protected fireConfigChanged(): void {
+  protected fireConfigChanged() {
     const { selectedBoard, selectedPort } = this.state;
     this.props.onConfigChange({ selectedBoard, selectedPort });
   }
@@ -256,19 +250,16 @@ export class BoardsConfig extends React.Component<
     this.props.onFocusNodeSet(element || undefined);
   };
 
-  override render(): React.ReactNode {
+  render(): React.ReactNode {
     return (
-      <>
+      <div className="body">
+        {this.renderContainer('boards', this.renderBoards.bind(this))}
         {this.renderContainer(
-          nls.localize('arduino/board/boards', 'boards'),
-          this.renderBoards.bind(this)
-        )}
-        {this.renderContainer(
-          nls.localize('arduino/board/ports', 'ports'),
+          'ports',
           this.renderPorts.bind(this),
           this.renderPortsFooter.bind(this)
         )}
-      </>
+      </div>
     );
   }
 
@@ -302,18 +293,6 @@ export class BoardsConfig extends React.Component<
       }
     }
 
-    const boardsList = Array.from(distinctBoards.values()).map((board) => (
-      <Item<BoardWithPackage>
-        key={toKey(board)}
-        item={board}
-        label={board.name}
-        details={board.details}
-        selected={board.selected}
-        onClick={this.selectBoard}
-        missing={board.missing}
-      />
-    ));
-
     return (
       <React.Fragment>
         <div className="search">
@@ -321,26 +300,25 @@ export class BoardsConfig extends React.Component<
             type="search"
             value={query}
             className="theia-input"
-            placeholder={nls.localize(
-              'arduino/board/searchBoard',
-              'Search board'
-            )}
+            placeholder="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>
-        )}
+        <div className="boards list">
+          {Array.from(distinctBoards.values()).map((board) => (
+            <Item<BoardWithPackage>
+              key={toKey(board)}
+              item={board}
+              label={board.name}
+              details={board.details}
+              selected={board.selected}
+              onClick={this.selectBoard}
+              missing={board.missing}
+            />
+          ))}
+        </div>
       </React.Fragment>
     );
   }
@@ -350,19 +328,27 @@ export class BoardsConfig extends React.Component<
     if (this.state.showAllPorts) {
       ports = this.state.knownPorts;
     } else {
-      ports = this.state.knownPorts.filter(
-        Port.visiblePorts(this.availableBoards)
-      );
+      ports = this.state.knownPorts.filter((port) => {
+        if (port.protocol === 'serial') {
+          return true;
+        }
+        // All other ports with different protocol are
+        // only shown if there is a recognized board
+        // connected
+        for (const board of this.availableBoards) {
+          if (board.port?.address === port.address) {
+            return true;
+          }
+        }
+      });
     }
     return !ports.length ? (
-      <div className="no-result">
-        {nls.localize('arduino/board/noPortsDiscovered', 'No ports discovered')}
-      </div>
+      <div className="loading noselect">No ports discovered</div>
     ) : (
       <div className="ports list">
         {ports.map((port) => (
           <Item<Port>
-            key={`${Port.keyOf(port)}`}
+            key={`${port.id}`}
             item={port}
             label={Port.toString(port)}
             selected={Port.sameAs(this.state.selectedPort, port)}
@@ -387,9 +373,7 @@ export class BoardsConfig extends React.Component<
             defaultChecked={this.state.showAllPorts}
             onChange={this.toggleFilterPorts}
           />
-          <span>
-            {nls.localize('arduino/board/showAllPorts', 'Show all ports')}
-          </span>
+          <span>Show all ports</span>
         </label>
       </div>
     );
@@ -428,5 +412,53 @@ export namespace BoardsConfig {
       const { name } = selectedBoard;
       return `${name}${port ? ` at ${port.address}` : ''}`;
     }
+
+    export function setConfig(
+      config: Config | undefined,
+      urlToAttachTo: URL
+    ): URL {
+      const copy = new URL(urlToAttachTo.toString());
+      if (!config) {
+        copy.searchParams.delete('boards-config');
+        return copy;
+      }
+
+      const selectedBoard = config.selectedBoard
+        ? {
+            name: config.selectedBoard.name,
+            fqbn: config.selectedBoard.fqbn,
+          }
+        : undefined;
+      const selectedPort = config.selectedPort
+        ? {
+            protocol: config.selectedPort.protocol,
+            address: config.selectedPort.address,
+          }
+        : undefined;
+      const jsonConfig = JSON.stringify({ selectedBoard, selectedPort });
+      copy.searchParams.set('boards-config', encodeURIComponent(jsonConfig));
+      return copy;
+    }
+
+    export function getConfig(url: URL): Config | undefined {
+      const encoded = url.searchParams.get('boards-config');
+      if (!encoded) {
+        return undefined;
+      }
+      try {
+        const raw = decodeURIComponent(encoded);
+        const candidate = JSON.parse(raw);
+        if (typeof candidate === 'object') {
+          return candidate;
+        }
+        console.warn(
+          `Expected candidate to be an object. It was ${typeof candidate}. URL was: ${url}`
+        );
+        return undefined;
+      } catch (e) {
+        console.log(`Could not get board config from URL: ${url}.`, e);
+        return undefined;
+      }
+    }
   }
 }

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

@@ -1,5 +1,5 @@
 import * as PQueue from 'p-queue';
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from 'inversify';
 import { CommandRegistry } from '@theia/core/lib/common/command';
 import { MenuModelRegistry } from '@theia/core/lib/common/menu';
 import {
@@ -13,7 +13,6 @@ import { BoardsDataStore } from './boards-data-store';
 import { MainMenuManager } from '../../common/main-menu-manager';
 import { ArduinoMenus, unregisterSubmenu } from '../menu/arduino-menus';
 import { nls } from '@theia/core/lib/common';
-import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 
 @injectable()
 export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
@@ -32,20 +31,11 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
   @inject(BoardsServiceProvider)
   protected readonly boardsServiceClient: BoardsServiceProvider;
 
-  @inject(FrontendApplicationStateService)
-  private readonly appStateService: FrontendApplicationStateService;
-
   protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
   protected readonly toDisposeOnBoardChange = new DisposableCollection();
 
   async onStart(): Promise<void> {
-    this.appStateService
-      .reachedState('ready')
-      .then(() =>
-        this.updateMenuActions(
-          this.boardsServiceClient.boardsConfig.selectedBoard
-        )
-      );
+    this.updateMenuActions(this.boardsServiceClient.boardsConfig.selectedBoard);
     this.boardsDataStore.onChanged(() =>
       this.updateMenuActions(
         this.boardsServiceClient.boardsConfig.selectedBoard
@@ -80,16 +70,16 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
                 string,
                 Disposable & { label: string }
               >();
-              let selectedValue = '';
               for (const value of values) {
                 const id = `${fqbn}-${option}--${value.value}`;
                 const command = { id };
+                const selectedValue = value.value;
                 const handler = {
                   execute: () =>
                     this.boardsDataStore.selectConfigOption({
                       fqbn,
                       option,
-                      selectedValue: value.value,
+                      selectedValue,
                     }),
                   isToggled: () => value.selected,
                 };
@@ -100,14 +90,8 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
                     { label: value.label }
                   )
                 );
-                if (value.selected) {
-                  selectedValue = value.label;
-                }
               }
-              this.menuRegistry.registerSubmenu(
-                menuPath,
-                `${label}${selectedValue ? `: "${selectedValue}"` : ''}`
-              );
+              this.menuRegistry.registerSubmenu(menuPath, label);
               this.toDisposeOnBoardChange.pushAll([
                 ...commands.values(),
                 Disposable.create(() =>
@@ -117,7 +101,7 @@ export class BoardsDataMenuUpdater implements FrontendApplicationContribution {
                   const { label } = commands.get(commandId)!;
                   this.menuRegistry.registerMenuAction(menuPath, {
                     commandId,
-                    order: String(i).padStart(4),
+                    order: `${i}`,
                     label,
                   });
                   return Disposable.create(() =>

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

@@ -1,4 +1,4 @@
-import { injectable, inject, named } from '@theia/core/shared/inversify';
+import { injectable, inject, named } from 'inversify';
 import { ILogger } from '@theia/core/lib/common/logger';
 import { deepClone } from '@theia/core/lib/common/objects';
 import { Event, Emitter } from '@theia/core/lib/common/event';
@@ -30,11 +30,11 @@ export class BoardsDataStore implements FrontendApplicationContribution {
   @inject(LocalStorageService)
   protected readonly storageService: LocalStorageService;
 
-  protected readonly onChangedEmitter = new Emitter<string[]>();
+  protected readonly onChangedEmitter = new Emitter<void>();
 
   onStart(): void {
-    this.notificationCenter.onPlatformDidInstall(async ({ item }) => {
-      const dataDidChangePerFqbn: string[] = [];
+    this.notificationCenter.onPlatformInstalled(async ({ item }) => {
+      let shouldFireChanged = false;
       for (const fqbn of item.boards
         .map(({ fqbn }) => fqbn)
         .filter(notEmpty)
@@ -49,18 +49,18 @@ export class BoardsDataStore implements FrontendApplicationContribution {
             data = details.configOptions;
             if (data.length) {
               await this.storageService.setData(key, data);
-              dataDidChangePerFqbn.push(fqbn);
+              shouldFireChanged = true;
             }
           }
         }
       }
-      if (dataDidChangePerFqbn.length) {
-        this.fireChanged(...dataDidChangePerFqbn);
+      if (shouldFireChanged) {
+        this.fireChanged();
       }
     });
   }
 
-  get onChanged(): Event<string[]> {
+  get onChanged(): Event<void> {
     return this.onChangedEmitter.event;
   }
 
@@ -116,7 +116,7 @@ export class BoardsDataStore implements FrontendApplicationContribution {
       fqbn,
       data: { ...data, selectedProgrammer },
     });
-    this.fireChanged(fqbn);
+    this.fireChanged();
     return true;
   }
 
@@ -146,7 +146,7 @@ export class BoardsDataStore implements FrontendApplicationContribution {
       return false;
     }
     await this.setData({ fqbn, data });
-    this.fireChanged(fqbn);
+    this.fireChanged();
     return true;
   }
 
@@ -190,8 +190,8 @@ export class BoardsDataStore implements FrontendApplicationContribution {
     }
   }
 
-  protected fireChanged(...fqbn: string[]): void {
-    this.onChangedEmitter.fire(fqbn);
+  protected fireChanged(): void {
+    this.onChangedEmitter.fire();
   }
 }
 

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

@@ -1,27 +1,21 @@
+import { inject, injectable, postConstruct } from 'inversify';
 import {
-  inject,
-  injectable,
-  postConstruct,
-} from '@theia/core/shared/inversify';
-import {
-  BoardSearch,
   BoardsPackage,
   BoardsService,
 } from '../../common/protocol/boards-service';
 import { ListWidget } from '../widgets/component-list/list-widget';
 import { ListItemRenderer } from '../widgets/component-list/list-item-renderer';
 import { nls } from '@theia/core/lib/common';
-import { BoardsFilterRenderer } from '../widgets/component-list/filter-renderer';
 
 @injectable()
-export class BoardsListWidget extends ListWidget<BoardsPackage, BoardSearch> {
+export class BoardsListWidget extends ListWidget<BoardsPackage> {
   static WIDGET_ID = 'boards-list-widget';
   static WIDGET_LABEL = nls.localize('arduino/boardsManager', 'Boards Manager');
 
   constructor(
-    @inject(BoardsService) service: BoardsService,
-    @inject(ListItemRenderer) itemRenderer: ListItemRenderer<BoardsPackage>,
-    @inject(BoardsFilterRenderer) filterRenderer: BoardsFilterRenderer
+    @inject(BoardsService) protected service: BoardsService,
+    @inject(ListItemRenderer)
+    protected itemRenderer: ListItemRenderer<BoardsPackage>
   ) {
     super({
       id: BoardsListWidget.WIDGET_ID,
@@ -30,26 +24,25 @@ export class BoardsListWidget extends ListWidget<BoardsPackage, BoardSearch> {
       searchable: service,
       installable: service,
       itemLabel: (item: BoardsPackage) => item.name,
+      itemDeprecated: (item: BoardsPackage) => item.deprecated,
       itemRenderer,
-      filterRenderer,
-      defaultSearchOptions: { query: '', type: 'All' },
     });
   }
 
   @postConstruct()
-  protected override init(): void {
+  protected init(): void {
     super.init();
     this.toDispose.pushAll([
-      this.notificationCenter.onPlatformDidInstall(() =>
+      this.notificationCenter.onPlatformInstalled(() =>
         this.refresh(undefined)
       ),
-      this.notificationCenter.onPlatformDidUninstall(() =>
+      this.notificationCenter.onPlatformUninstalled(() =>
         this.refresh(undefined)
       ),
     ]);
   }
 
-  protected override async install({
+  protected async install({
     item,
     progressId,
     version,
@@ -70,7 +63,7 @@ export class BoardsListWidget extends ListWidget<BoardsPackage, BoardSearch> {
     );
   }
 
-  protected override async uninstall({
+  protected async uninstall({
     item,
     progressId,
   }: {

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

@@ -1,12 +1,7 @@
-import { injectable, inject } from '@theia/core/shared/inversify';
+import { injectable, inject } from 'inversify';
 import { Emitter } from '@theia/core/lib/common/event';
 import { ILogger } from '@theia/core/lib/common/logger';
-import {
-  Command,
-  CommandContribution,
-  CommandRegistry,
-  CommandService,
-} from '@theia/core/lib/common/command';
+import { CommandService } from '@theia/core/lib/common/command';
 import { MessageService } from '@theia/core/lib/common/message-service';
 import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
 import { RecursiveRequired } from '../../common/types';
@@ -18,28 +13,16 @@ import {
   AttachedBoardsChangeEvent,
   BoardWithPackage,
   BoardUserField,
-  AvailablePorts,
 } from '../../common/protocol';
 import { BoardsConfig } from './boards-config';
 import { naturalCompare } from '../../common/utils';
 import { NotificationCenter } from '../notification-center';
+import { ArduinoCommands } from '../arduino-commands';
 import { StorageWrapper } from '../storage-wrapper';
 import { nls } from '@theia/core/lib/common';
-import { Deferred } from '@theia/core/lib/common/promise-util';
-import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
-import { Unknown } from '../../common/nls';
-import {
-  StartupTask,
-  StartupTaskProvider,
-} from '../../electron-common/startup-task';
 
 @injectable()
-export class BoardsServiceProvider
-  implements
-    FrontendApplicationContribution,
-    StartupTaskProvider,
-    CommandContribution
-{
+export class BoardsServiceProvider implements FrontendApplicationContribution {
   @inject(ILogger)
   protected logger: ILogger;
 
@@ -55,19 +38,12 @@ export class BoardsServiceProvider
   @inject(NotificationCenter)
   protected notificationCenter: NotificationCenter;
 
-  @inject(FrontendApplicationStateService)
-  private readonly appStateService: FrontendApplicationStateService;
-
   protected readonly onBoardsConfigChangedEmitter =
     new Emitter<BoardsConfig.Config>();
   protected readonly onAvailableBoardsChangedEmitter = new Emitter<
     AvailableBoard[]
   >();
-  protected readonly onAvailablePortsChangedEmitter = new Emitter<{
-    newState: Port[];
-    oldState: Port[];
-  }>();
-  private readonly inheritedConfig = new Deferred<BoardsConfig.Config>();
+  protected readonly onAvailablePortsChangedEmitter = new Emitter<Port[]>();
 
   /**
    * Used for the auto-reconnecting. Sometimes, the attached board gets disconnected after uploading something to it.
@@ -85,16 +61,11 @@ export class BoardsServiceProvider
   protected _availablePorts: Port[] = [];
   protected _availableBoards: AvailableBoard[] = [];
 
-  private lastBoardsConfigOnUpload: BoardsConfig.Config | undefined;
-  private lastAvailablePortsOnUpload: Port[] | undefined;
-  private boardConfigToAutoSelect: BoardsConfig.Config | undefined;
-
   /**
-   * Unlike `onAttachedBoardsChanged` this event fires when the user modifies the selected board in the IDE.\
-   * This event also fires, when the boards package was not available for the currently selected board,
+   * Unlike `onAttachedBoardsChanged` this even fires when the user modifies the selected board in the IDE.\
+   * This even also fires, when the boards package was not available for the currently selected board,
    * and the user installs the board package. Note: installing a board package will set the `fqbn` of the
-   * currently selected board.
-   *
+   * currently selected board.\
    * This event is also emitted when the board package for the currently selected board was uninstalled.
    */
   readonly onBoardsConfigChanged = this.onBoardsConfigChangedEmitter.event;
@@ -102,143 +73,29 @@ export class BoardsServiceProvider
     this.onAvailableBoardsChangedEmitter.event;
   readonly onAvailablePortsChanged = this.onAvailablePortsChangedEmitter.event;
 
-  private readonly _reconciled = new Deferred<void>();
-
   onStart(): void {
-    this.notificationCenter.onAttachedBoardsDidChange(
+    this.notificationCenter.onAttachedBoardsChanged(
       this.notifyAttachedBoardsChanged.bind(this)
     );
-    this.notificationCenter.onPlatformDidInstall(
+    this.notificationCenter.onPlatformInstalled(
       this.notifyPlatformInstalled.bind(this)
     );
-    this.notificationCenter.onPlatformDidUninstall(
+    this.notificationCenter.onPlatformUninstalled(
       this.notifyPlatformUninstalled.bind(this)
     );
 
-    this.appStateService.reachedState('ready').then(async () => {
-      const [state] = await Promise.all([
-        this.boardsService.getState(),
-        this.loadState(),
-      ]);
-      const { boards: attachedBoards, ports: availablePorts } =
-        AvailablePorts.split(state);
+    Promise.all([
+      this.boardsService.getAttachedBoards(),
+      this.boardsService.getAvailablePorts(),
+      this.loadState(),
+    ]).then(([attachedBoards, availablePorts]) => {
       this._attachedBoards = attachedBoards;
-      const oldState = this._availablePorts.slice();
       this._availablePorts = availablePorts;
-      this.onAvailablePortsChangedEmitter.fire({
-        newState: this._availablePorts.slice(),
-        oldState,
-      });
-
-      await this.reconcileAvailableBoards();
-
-      this.tryReconnect();
-      this._reconciled.resolve();
+      this.onAvailablePortsChangedEmitter.fire(this._availablePorts);
+      this.reconcileAvailableBoards().then(() => this.tryReconnect());
     });
   }
 
-  registerCommands(registry: CommandRegistry): void {
-    registry.registerCommand(USE_INHERITED_CONFIG, {
-      execute: (inheritedConfig: BoardsConfig.Config) =>
-        this.inheritedConfig.resolve(inheritedConfig),
-    });
-  }
-
-  get reconciled(): Promise<void> {
-    return this._reconciled.promise;
-  }
-
-  snapshotBoardDiscoveryOnUpload(): void {
-    this.lastBoardsConfigOnUpload = this._boardsConfig;
-    this.lastAvailablePortsOnUpload = this._availablePorts;
-  }
-
-  clearBoardDiscoverySnapshot(): void {
-    this.lastBoardsConfigOnUpload = undefined;
-    this.lastAvailablePortsOnUpload = undefined;
-  }
-
-  attemptPostUploadAutoSelect(): void {
-    setTimeout(() => {
-      if (this.lastBoardsConfigOnUpload && this.lastAvailablePortsOnUpload) {
-        this.attemptAutoSelect({
-          ports: this._availablePorts,
-          boards: this._availableBoards,
-        });
-      }
-    }, 2000); // 2 second delay same as IDE 1.8
-  }
-
-  private attemptAutoSelect(
-    newState: AttachedBoardsChangeEvent['newState']
-  ): void {
-    this.deriveBoardConfigToAutoSelect(newState);
-    this.tryReconnect();
-  }
-
-  private deriveBoardConfigToAutoSelect(
-    newState: AttachedBoardsChangeEvent['newState']
-  ): void {
-    if (!this.lastBoardsConfigOnUpload || !this.lastAvailablePortsOnUpload) {
-      this.boardConfigToAutoSelect = undefined;
-      return;
-    }
-
-    const oldPorts = this.lastAvailablePortsOnUpload;
-    const { ports: newPorts, boards: newBoards } = newState;
-
-    const appearedPorts =
-      oldPorts.length > 0
-        ? newPorts.filter((newPort: Port) =>
-            oldPorts.every((oldPort: Port) => !Port.sameAs(newPort, oldPort))
-          )
-        : newPorts;
-
-    for (const port of appearedPorts) {
-      const boardOnAppearedPort = newBoards.find((board: Board) =>
-        Port.sameAs(board.port, port)
-      );
-
-      const lastBoardsConfigOnUpload = this.lastBoardsConfigOnUpload;
-
-      if (boardOnAppearedPort && lastBoardsConfigOnUpload.selectedBoard) {
-        const boardIsSameHardware = Board.hardwareIdEquals(
-          boardOnAppearedPort,
-          lastBoardsConfigOnUpload.selectedBoard
-        );
-
-        const boardIsSameFqbn = Board.sameAs(
-          boardOnAppearedPort,
-          lastBoardsConfigOnUpload.selectedBoard
-        );
-
-        if (!boardIsSameHardware && !boardIsSameFqbn) continue;
-
-        let boardToAutoSelect = boardOnAppearedPort;
-        if (boardIsSameHardware && !boardIsSameFqbn) {
-          const { name, fqbn } = lastBoardsConfigOnUpload.selectedBoard;
-
-          boardToAutoSelect = {
-            ...boardToAutoSelect,
-            name:
-              boardToAutoSelect.name === Unknown || !boardToAutoSelect.name
-                ? name
-                : boardToAutoSelect.name,
-            fqbn: boardToAutoSelect.fqbn || fqbn,
-          };
-        }
-
-        this.clearBoardDiscoverySnapshot();
-
-        this.boardConfigToAutoSelect = {
-          selectedBoard: boardToAutoSelect,
-          selectedPort: port,
-        };
-        return;
-      }
-    }
-  }
-
   protected notifyAttachedBoardsChanged(
     event: AttachedBoardsChangeEvent
   ): void {
@@ -247,22 +104,10 @@ export class BoardsServiceProvider
       this.logger.info(AttachedBoardsChangeEvent.toString(event));
       this.logger.info('------------------------------------------');
     }
-
     this._attachedBoards = event.newState.boards;
-    const oldState = this._availablePorts.slice();
     this._availablePorts = event.newState.ports;
-    this.onAvailablePortsChangedEmitter.fire({
-      newState: this._availablePorts.slice(),
-      oldState,
-    });
-    this.reconcileAvailableBoards().then(() => {
-      const { uploadInProgress } = event;
-      // avoid attempting "auto-selection" while an
-      // upload is in progress
-      if (!uploadInProgress) {
-        this.attemptAutoSelect(event.newState);
-      }
-    });
+    this.onAvailablePortsChangedEmitter.fire(this._availablePorts);
+    this.reconcileAvailableBoards().then(() => this.tryReconnect());
   }
 
   protected notifyPlatformInstalled(event: { item: BoardsPackage }): void {
@@ -310,7 +155,7 @@ export class BoardsServiceProvider
           .then(async (answer) => {
             if (answer === yes) {
               this.commandService.executeCommand(
-                'arduino-open-boards-dialog',
+                ArduinoCommands.OPEN_BOARDS_DIALOG.id,
                 selectedBoard.name
               );
             }
@@ -339,11 +184,9 @@ export class BoardsServiceProvider
         // it is just a FQBN, so we need to find the `selected` board among the `AvailableBoards`
         const selectedAvailableBoard = AvailableBoard.is(selectedBoard)
           ? selectedBoard
-          : this._availableBoards.find(
-              (availableBoard) =>
-                Board.hardwareIdEquals(availableBoard, selectedBoard) ||
-                Board.sameAs(availableBoard, selectedBoard)
-            );
+          : this._availableBoards.find((availableBoard) =>
+            Board.sameAs(availableBoard, selectedBoard)
+          );
         if (
           selectedAvailableBoard &&
           selectedAvailableBoard.selected &&
@@ -366,30 +209,11 @@ export class BoardsServiceProvider
     }
   }
 
-  protected tryReconnect(): boolean {
+  protected async tryReconnect(): Promise<boolean> {
     if (this.latestValidBoardsConfig && !this.canUploadTo(this.boardsConfig)) {
-      // ** Reconnect to a board unplugged from, and plugged back into the same port
       for (const board of this.availableBoards.filter(
         ({ state }) => state !== AvailableBoard.State.incomplete
       )) {
-        if (
-          Board.hardwareIdEquals(
-            this.latestValidBoardsConfig.selectedBoard,
-            board
-          )
-        ) {
-          const { name, fqbn } = this.latestValidBoardsConfig.selectedBoard;
-          this.boardsConfig = {
-            selectedBoard: {
-              name: board.name === Unknown || !board.name ? name : board.name,
-              fqbn: board.fqbn || fqbn,
-              port: board.port,
-            },
-            selectedPort: board.port,
-          };
-          return true;
-        }
-
         if (
           this.latestValidBoardsConfig.selectedBoard.fqbn === board.fqbn &&
           this.latestValidBoardsConfig.selectedBoard.name === board.name &&
@@ -399,15 +223,23 @@ export class BoardsServiceProvider
           return true;
         }
       }
-      // **
-
-      // ** Reconnect to a board whose port changed due to an upload
-      if (!this.boardConfigToAutoSelect) return false;
-
-      this.boardsConfig = this.boardConfigToAutoSelect;
-      this.boardConfigToAutoSelect = undefined;
-      return true;
-      // **
+      // If we could not find an exact match, we compare the board FQBN-name pairs and ignore the port, as it might have changed.
+      // See documentation on `latestValidBoardsConfig`.
+      for (const board of this.availableBoards.filter(
+        ({ state }) => state !== AvailableBoard.State.incomplete
+      )) {
+        if (
+          this.latestValidBoardsConfig.selectedBoard.fqbn === board.fqbn &&
+          this.latestValidBoardsConfig.selectedBoard.name === board.name &&
+          this.latestValidBoardsConfig.selectedPort.protocol === board.port?.protocol
+        ) {
+          this.boardsConfig = {
+            ...this.latestValidBoardsConfig,
+            selectedPort: board.port,
+          };
+          return true;
+        }
+      }
     }
     return false;
   }
@@ -426,7 +258,7 @@ export class BoardsServiceProvider
   }
 
   protected setBoardsConfig(config: BoardsConfig.Config): void {
-    this.logger.debug('Board config changed: ', JSON.stringify(config));
+    this.logger.info('Board config changed: ', JSON.stringify(config));
     this._boardsConfig = config;
     this.latestBoardsConfig = this._boardsConfig;
     if (this.canUploadTo(this._boardsConfig)) {
@@ -446,16 +278,14 @@ export class BoardsServiceProvider
   }
 
   async selectedBoardUserFields(): Promise<BoardUserField[]> {
-    if (!this._boardsConfig.selectedBoard) {
+    if (!this._boardsConfig.selectedBoard || !this._boardsConfig.selectedPort) {
       return [];
     }
     const fqbn = this._boardsConfig.selectedBoard.fqbn;
     if (!fqbn) {
       return [];
     }
-    // Protocol must be set to `default` when uploading without a port selected:
-    // https://arduino.github.io/arduino-cli/dev/platform-specification/#sketch-upload-configuration
-    const protocol = this._boardsConfig.selectedPort?.protocol || 'default';
+    const protocol = this._boardsConfig.selectedPort.protocol;
     return await this.boardsService.getBoardUserFields({ fqbn, protocol });
   }
 
@@ -534,16 +364,6 @@ export class BoardsServiceProvider
     return this._availableBoards;
   }
 
-  /**
-   * @deprecated Do not use this API, it will be removed. This is a hack to be able to set the missing port `properties` before an upload.
-   *
-   * See: https://github.com/arduino/arduino-ide/pull/1335#issuecomment-1224355236.
-   */
-  // TODO: remove this API and fix the selected board config store/restore correctly.
-  get availablePorts(): Port[] {
-    return this._availablePorts.slice();
-  }
-
   async waitUntilAvailable(
     what: Board & { port: Port },
     timeout?: number
@@ -556,14 +376,14 @@ export class BoardsServiceProvider
     const timeoutTask =
       !!timeout && timeout > 0
         ? new Promise<void>((_, reject) =>
-            setTimeout(
-              () => reject(new Error(`Timeout after ${timeout} ms.`)),
-              timeout
-            )
+          setTimeout(
+            () => reject(new Error(`Timeout after ${timeout} ms.`)),
+            timeout
           )
+        )
         : new Promise<void>(() => {
-            /* never */
-          });
+          /* never */
+        });
     const waitUntilTask = new Promise<void>((resolve) => {
       let candidate = find(what, this.availableBoards);
       if (candidate) {
@@ -600,19 +420,28 @@ export class BoardsServiceProvider
     const currentAvailableBoards = this._availableBoards;
     const availableBoards: AvailableBoard[] = [];
     const attachedBoards = this._attachedBoards.filter(({ port }) => !!port);
-    const availableBoardPorts = availablePorts.filter(
-      Port.visiblePorts(attachedBoards)
-    );
+    const availableBoardPorts = availablePorts.filter((port) => {
+      if (port.protocol === 'serial') {
+        // We always show all serial ports, even if there
+        // is no recognized board connected to it
+        return true;
+      }
+
+      // All other ports with different protocol are
+      // only shown if there is a recognized board
+      // connected
+      for (const board of attachedBoards) {
+        if (board.port?.address === port.address) {
+          return true;
+        }
+      }
+      return false;
+    });
 
     for (const boardPort of availableBoardPorts) {
       const board = attachedBoards.find(({ port }) =>
         Port.sameAs(boardPort, port)
       );
-      // "board" will always be falsey for
-      // port that was originally mapped
-      // to unknown board and then selected
-      // manually by user
-
       const lastSelectedBoard = await this.getLastSelectedBoardOnPort(
         boardPort
       );
@@ -631,14 +460,12 @@ export class BoardsServiceProvider
         availableBoard = {
           ...lastSelectedBoard,
           state: AvailableBoard.State.guessed,
-          selected:
-            BoardsConfig.Config.sameAs(boardsConfig, lastSelectedBoard) &&
-            Port.sameAs(boardPort, boardsConfig.selectedPort), // to avoid double selection
+          selected: BoardsConfig.Config.sameAs(boardsConfig, lastSelectedBoard),
           port: boardPort,
         };
       } else {
         availableBoard = {
-          name: Unknown,
+          name: nls.localize('arduino/common/unknown', 'Unknown'),
           port: boardPort,
           state: AvailableBoard.State.incomplete,
         };
@@ -648,9 +475,8 @@ export class BoardsServiceProvider
 
     if (
       boardsConfig.selectedBoard &&
-      availableBoards.every(({ selected }) => !selected)
+      !availableBoards.some(({ selected }) => selected)
     ) {
-      let port = boardsConfig.selectedPort;
       // If the selected board has the same port of an unknown board
       // that is already in availableBoards we might get a duplicate port.
       // So we remove the one already in the array and add the selected one.
@@ -658,15 +484,11 @@ export class BoardsServiceProvider
         (board) => board.port?.address === boardsConfig.selectedPort?.address
       );
       if (found >= 0) {
-        // get the "Unknown board port" that we will substitute,
-        // then we can include it in the "availableBoard object"
-        // pushed below; to ensure addressLabel is included
-        port = availableBoards[found].port;
         availableBoards.splice(found, 1);
       }
       availableBoards.push({
         ...boardsConfig.selectedBoard,
-        port,
+        port: boardsConfig.selectedPort,
         selected: true,
         state: AvailableBoard.State.incomplete,
       });
@@ -678,7 +500,6 @@ export class BoardsServiceProvider
     for (let i = 0; !hasChanged && i < availableBoards.length; i++) {
       const [left, right] = [availableBoards[i], currentAvailableBoards[i]];
       hasChanged =
-        left.fqbn !== right.fqbn ||
         !!AvailableBoard.compare(left, right) ||
         left.selected !== right.selected;
     }
@@ -713,9 +534,8 @@ export class BoardsServiceProvider
 
   protected getLastSelectedBoardOnPortKey(port: Port | string): string {
     // TODO: we lose the port's `protocol` info (`serial`, `network`, etc.) here if the `port` is a `string`.
-    return `last-selected-board-on-port:${
-      typeof port === 'string' ? port : port.address
-    }`;
+    return `last-selected-board-on-port:${typeof port === 'string' ? port : port.address
+      }`;
   }
 
   protected async loadState(): Promise<void> {
@@ -732,14 +552,11 @@ export class BoardsServiceProvider
       let storedLatestBoardsConfig = await this.getData<
         BoardsConfig.Config | undefined
       >('latest-boards-config');
-      // Try to get from the startup task. Wait for it, then timeout. Maybe it never arrives.
+      // Try to get from the URL if it was not persisted.
       if (!storedLatestBoardsConfig) {
-        storedLatestBoardsConfig = await Promise.race([
-          this.inheritedConfig.promise,
-          new Promise<undefined>((resolve) =>
-            setTimeout(() => resolve(undefined), 2_000)
-          ),
-        ]);
+        storedLatestBoardsConfig = BoardsConfig.Config.getConfig(
+          new URL(window.location.href)
+        );
       }
       if (storedLatestBoardsConfig) {
         this.latestBoardsConfig = storedLatestBoardsConfig;
@@ -762,31 +579,8 @@ export class BoardsServiceProvider
       key
     );
   }
-
-  tasks(): StartupTask[] {
-    return [
-      {
-        command: USE_INHERITED_CONFIG.id,
-        args: [this.boardsConfig],
-      },
-    ];
-  }
 }
 
-/**
- * It should be neither visible nor called from outside.
- *
- * This service creates a startup task with the current board config and
- * passes the task to the electron-main process so that the new window
- * can inherit the boards config state of this service.
- *
- * Note that the state is always set, but new windows might ignore it.
- * For example, the new window already has a valid boards config persisted to the local storage.
- */
-const USE_INHERITED_CONFIG: Command = {
-  id: 'arduino-use-inherited-boards-config',
-};
-
 /**
  * Representation of a ready-to-use board, either the user has configured it or was automatically recognized by the CLI.
  * An available board was not necessarily recognized by the CLI (e.g.: it is a 3rd party board) or correctly configured but ready for `verify`.

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

@@ -1,16 +1,15 @@
-import * as React from '@theia/core/shared/react';
-import * as ReactDOM from '@theia/core/shared/react-dom';
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
 import { CommandRegistry } from '@theia/core/lib/common/command';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { Port } from '../../common/protocol';
-import { OpenBoardsConfig } from '../contributions/open-boards-config';
+import { BoardsConfig } from './boards-config';
+import { ArduinoCommands } from '../arduino-commands';
 import {
   BoardsServiceProvider,
   AvailableBoard,
 } from './boards-service-provider';
 import { nls } from '@theia/core/lib/common';
-import classNames from 'classnames';
-import { BoardsConfig } from './boards-config';
 
 export interface BoardsDropDownListCoords {
   readonly top: number;
@@ -29,12 +28,10 @@ export namespace BoardsDropDown {
 
 export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
   protected dropdownElement: HTMLElement;
-  private listRef: React.RefObject<HTMLDivElement>;
 
   constructor(props: BoardsDropDown.Props) {
     super(props);
 
-    this.listRef = React.createRef();
     let list = document.getElementById('boards-dropdown-container');
     if (!list) {
       list = document.createElement('div');
@@ -44,13 +41,7 @@ export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
     }
   }
 
-  override componentDidUpdate(prevProps: BoardsDropDown.Props): void {
-    if (prevProps.coords === 'hidden' && this.listRef.current) {
-      this.listRef.current.focus();
-    }
-  }
-
-  override render(): React.ReactNode {
+  render(): React.ReactNode {
     return ReactDOM.createPortal(this.renderNode(), this.dropdownElement);
   }
 
@@ -70,22 +61,21 @@ export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
           position: 'absolute',
           ...coords,
         }}
-        ref={this.listRef}
-        tabIndex={0}
       >
-        <div className="arduino-boards-dropdown-list--items-container">
-          {items
-            .map(({ name, port, selected, onClick }) => ({
-              boardLabel: name,
-              port,
-              selected,
-              onClick,
-            }))
-            .map(this.renderItem)}
-        </div>
+        {items
+          .map(({ name, port, selected, onClick }) => ({
+            label: nls.localize(
+              'arduino/board/boardListItem',
+              '{0} at {1}',
+              name,
+              Port.toString(port)
+            ),
+            selected,
+            onClick,
+          }))
+          .map(this.renderItem)}
         <div
           key={footerLabel}
-          tabIndex={0}
           className="arduino-boards-dropdown-item arduino-board-dropdown-footer"
           onClick={() => this.props.openBoardsConfig()}
         >
@@ -96,52 +86,22 @@ export class BoardsDropDown extends React.Component<BoardsDropDown.Props> {
   }
 
   protected renderItem({
-    boardLabel,
-    port,
+    label,
     selected,
     onClick,
   }: {
-    boardLabel: string;
-    port: Port;
+    label: string;
     selected?: boolean;
     onClick: () => void;
   }): React.ReactNode {
-    const protocolIcon = iconNameFromProtocol(port.protocol);
-    const onKeyUp = (e: React.KeyboardEvent) => {
-      if (e.key === 'Enter') {
-        onClick();
-      }
-    };
-
     return (
       <div
-        key={`board-item--${boardLabel}-${port.address}`}
-        className={classNames('arduino-boards-dropdown-item', {
-          'arduino-boards-dropdown-item--selected': selected,
-        })}
+        key={label}
+        className={`arduino-boards-dropdown-item ${selected ? 'selected' : ''}`}
         onClick={onClick}
-        onKeyUp={onKeyUp}
-        tabIndex={0}
       >
-        <div
-          className={classNames(
-            'arduino-boards-dropdown-item--protocol',
-            'fa',
-            protocolIcon
-          )}
-        />
-        <div
-          className="arduino-boards-dropdown-item--label"
-          title={`${boardLabel}\n${port.address}`}
-        >
-          <div className="arduino-boards-dropdown-item--board-label noWrapInfo noselect">
-            {boardLabel}
-          </div>
-          <div className="arduino-boards-dropdown-item--port-label noWrapInfo noselect">
-            {port.addressLabel}
-          </div>
-        </div>
-        {selected ? <div className="fa fa-check" /> : ''}
+        <div>{label}</div>
+        {selected ? <span className="fa fa-check" /> : ''}
       </div>
     );
   }
@@ -159,7 +119,7 @@ export class BoardsToolBarItem extends React.Component<
   constructor(props: BoardsToolBarItem.Props) {
     super(props);
 
-    const { availableBoards } = props.boardsServiceProvider;
+    const { availableBoards } = props.boardsServiceClient;
     this.state = {
       availableBoards,
       coords: 'hidden',
@@ -170,17 +130,17 @@ export class BoardsToolBarItem extends React.Component<
     });
   }
 
-  override componentDidMount(): void {
-    this.props.boardsServiceProvider.onAvailableBoardsChanged(
-      (availableBoards) => this.setState({ availableBoards })
+  componentDidMount() {
+    this.props.boardsServiceClient.onAvailableBoardsChanged((availableBoards) =>
+      this.setState({ availableBoards })
     );
   }
 
-  override componentWillUnmount(): void {
+  componentWillUnmount(): void {
     this.toDispose.dispose();
   }
 
-  protected readonly show = (event: React.MouseEvent<HTMLElement>): void => {
+  protected readonly show = (event: React.MouseEvent<HTMLElement>) => {
     const { currentTarget: element } = event;
     if (element instanceof HTMLElement) {
       if (this.state.coords === 'hidden') {
@@ -201,45 +161,38 @@ export class BoardsToolBarItem extends React.Component<
     event.nativeEvent.stopImmediatePropagation();
   };
 
-  override render(): React.ReactNode {
+  render(): React.ReactNode {
     const { coords, availableBoards } = this.state;
-    const { selectedBoard, selectedPort } =
-      this.props.boardsServiceProvider.boardsConfig;
-
-    const boardLabel =
-      selectedBoard?.name ||
-      nls.localize('arduino/board/selectBoard', 'Select Board');
-    const selectedPortLabel = portLabel(selectedPort?.address);
-
-    const isConnected = Boolean(selectedBoard && selectedPort);
-    const protocolIcon = isConnected
-      ? iconNameFromProtocol(selectedPort?.protocol || '')
-      : null;
-    const protocolIconClassNames = classNames(
-      'arduino-boards-toolbar-item--protocol',
-      'fa',
-      protocolIcon
-    );
+    const boardsConfig = this.props.boardsServiceClient.boardsConfig;
+    const title = BoardsConfig.Config.toString(boardsConfig, {
+      default: nls.localize(
+        'arduino/common/noBoardSelected',
+        '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"
-          title={selectedPortLabel}
-          onClick={this.show}
-        >
-          {protocolIcon && <div className={protocolIconClassNames} />}
-          <div
-            className={classNames(
-              'arduino-boards-toolbar-item--label',
-              'noWrapInfo',
-              'noselect',
-              { 'arduino-boards-toolbar-item--label-connected': isConnected }
-            )}
-          >
-            {boardLabel}
+        <div 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 className="fa fa-caret-down caret" />
         </div>
         <BoardsDropDown
           coords={coords}
@@ -248,20 +201,17 @@ export class BoardsToolBarItem extends React.Component<
             .map((board) => ({
               ...board,
               onClick: () => {
-                if (!board.fqbn) {
-                  const previousBoardConfig =
-                    this.props.boardsServiceProvider.boardsConfig;
-                  this.props.boardsServiceProvider.boardsConfig = {
+                if (board.state === AvailableBoard.State.incomplete) {
+                  this.props.boardsServiceClient.boardsConfig = {
                     selectedPort: board.port,
                   };
-                  this.openDialog(previousBoardConfig);
+                  this.openDialog();
                 } else {
-                  this.props.boardsServiceProvider.boardsConfig = {
+                  this.props.boardsServiceClient.boardsConfig = {
                     selectedBoard: board,
                     selectedPort: board.port,
                   };
                 }
-                this.setState({ coords: 'hidden' });
               },
             }))}
           openBoardsConfig={this.openDialog}
@@ -270,25 +220,14 @@ export class BoardsToolBarItem extends React.Component<
     );
   }
 
-  protected openDialog = async (
-    previousBoardConfig?: BoardsConfig.Config
-  ): Promise<void> => {
-    const selectedBoardConfig =
-      await this.props.commands.executeCommand<BoardsConfig.Config>(
-        OpenBoardsConfig.Commands.OPEN_DIALOG.id
-      );
-    if (
-      previousBoardConfig &&
-      (!selectedBoardConfig?.selectedPort ||
-        !selectedBoardConfig?.selectedBoard)
-    ) {
-      this.props.boardsServiceProvider.boardsConfig = previousBoardConfig;
-    }
+  protected openDialog = () => {
+    this.props.commands.executeCommand(ArduinoCommands.OPEN_BOARDS_DIALOG.id);
+    this.setState({ coords: 'hidden' });
   };
 }
 export namespace BoardsToolBarItem {
   export interface Props {
-    readonly boardsServiceProvider: BoardsServiceProvider;
+    readonly boardsServiceClient: BoardsServiceProvider;
     readonly commands: CommandRegistry;
   }
 
@@ -297,26 +236,3 @@ export namespace BoardsToolBarItem {
     coords: BoardsDropDownListCoords | 'hidden';
   }
 }
-
-function iconNameFromProtocol(protocol: string): string {
-  switch (protocol) {
-    case 'serial':
-      return 'fa-arduino-technology-usb';
-    case 'network':
-      return 'fa-arduino-technology-connection';
-    /* 
-      Bluetooth ports are not listed yet from the CLI;
-      Not sure about the naming ('bluetooth'); make sure it's correct before uncommenting the following lines
-    */
-    // case 'bluetooth':
-    //   return 'fa-arduino-technology-bluetooth';
-    default:
-      return 'fa-arduino-technology-3dimensionscube';
-  }
-}
-
-function portLabel(portName?: string): string {
-  return portName
-    ? nls.localize('arduino/board/portLabel', 'Port: {0}', portName)
-    : nls.localize('arduino/board/disconnected', 'Disconnected');
-}

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

@@ -1,17 +1,10 @@
-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
-> {
+export class BoardsListWidgetFrontendContribution extends ListWidgetFrontendContribution<BoardsPackage> {
   constructor() {
     super({
       widgetId: BoardsListWidget.WIDGET_ID,
@@ -25,16 +18,7 @@ export class BoardsListWidgetFrontendContribution extends ListWidgetFrontendCont
     });
   }
 
-  protected canParse(uri: URI): boolean {
-    try {
-      BoardSearch.UriParser.parse(uri);
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  protected parse(uri: URI): BoardSearch | undefined {
-    return BoardSearch.UriParser.parse(uri);
+  async initializeLayout(): Promise<void> {
+    this.openView();
   }
 }

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

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

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

@@ -1,102 +0,0 @@
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
-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,4 +1,4 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from 'inversify';
 import * as moment from 'moment';
 import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { isOSX, isWindows } from '@theia/core/lib/common/os';
@@ -22,13 +22,13 @@ export class About extends Contribution {
   @inject(ConfigService)
   protected readonly configService: ConfigService;
 
-  override registerCommands(registry: CommandRegistry): void {
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(About.Commands.ABOUT_APP, {
       execute: () => this.showAbout(),
     });
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     registry.registerMenuAction(ArduinoMenus.HELP__ABOUT_GROUP, {
       commandId: About.Commands.ABOUT_APP.id,
       label: nls.localize(
@@ -41,16 +41,22 @@ export class About extends Contribution {
   }
 
   async showAbout(): Promise<void> {
-    const version = await this.configService.getVersion();
+    const {
+      version,
+      commit,
+      status: cliStatus,
+    } = await this.configService.getVersion();
     const buildDate = this.buildDate;
     const detail = (showAll: boolean) =>
       nls.localize(
         'arduino/about/detail',
-        'Version: {0}\nDate: {1}{2}\nCLI Version: {3}\n\n{4}',
+        'Version: {0}\nDate: {1}{2}\nCLI Version: {3}{4} [{5}]\n\n{6}',
         remote.app.getVersion(),
         buildDate ? buildDate : nls.localize('', 'dev build'),
         buildDate && showAll ? ` (${this.ago(buildDate)})` : '',
         version,
+        cliStatus ? ` ${cliStatus}` : '',
+        commit,
         nls.localize(
           'arduino/about/copyright',
           'Copyright © {0} Arduino SA',

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,4 +1,4 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from 'inversify';
 import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import {
@@ -7,24 +7,22 @@ import {
   CommandRegistry,
   MenuModelRegistry,
   URI,
-  Sketch,
 } from './contribution';
 import { FileDialogService } from '@theia/filesystem/lib/browser';
 import { nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../sketches-service-client-impl';
 
 @injectable()
 export class AddFile extends SketchContribution {
   @inject(FileDialogService)
-  private readonly fileDialogService: FileDialogService;
+  protected readonly fileDialogService: FileDialogService;
 
-  override registerCommands(registry: CommandRegistry): void {
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(AddFile.Commands.ADD_FILE, {
       execute: () => this.addFile(),
     });
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     registry.registerMenuAction(ArduinoMenus.SKETCH__UTILS_GROUP, {
       commandId: AddFile.Commands.ADD_FILE.id,
       label: nls.localize('arduino/contributions/addFile', 'Add File') + '...',
@@ -32,9 +30,9 @@ export class AddFile extends SketchContribution {
     });
   }
 
-  private async addFile(): Promise<void> {
+  protected async addFile(): Promise<void> {
     const sketch = await this.sketchServiceClient.currentSketch();
-    if (!CurrentSketch.isValid(sketch)) {
+    if (!sketch) {
       return;
     }
     const toAddUri = await this.fileDialogService.showOpenDialog({
@@ -42,12 +40,13 @@ export class AddFile extends SketchContribution {
       canSelectFiles: true,
       canSelectFolders: false,
       canSelectMany: false,
-      modal: true,
     });
     if (!toAddUri) {
       return;
     }
-    const { uri: targetUri, filename } = this.resolveTarget(sketch, toAddUri);
+    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({
@@ -79,22 +78,6 @@ export class AddFile extends SketchContribution {
       }
     );
   }
-
-  // https://github.com/arduino/arduino-ide/issues/284#issuecomment-1364533662
-  // File the file to add has one of the following extension, it goes to the sketch folder root: .ino, .h, .cpp, .c, .S
-  // Otherwise, the files goes to the `data` folder inside the sketch folder root.
-  private resolveTarget(
-    sketch: Sketch,
-    toAddUri: URI
-  ): { uri: URI; filename: string } {
-    const path = toAddUri.path;
-    const filename = path.base;
-    let root = new URI(sketch.uri);
-    if (!Sketch.Extensions.CODE_FILES.includes(path.ext)) {
-      root = root.resolve('data');
-    }
-    return { uri: root.resolve(filename), filename: filename };
-  }
 }
 
 export namespace AddFile {

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

@@ -1,10 +1,14 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from 'inversify';
 import * as remote from '@theia/core/electron-shared/@electron/remote';
 import URI from '@theia/core/lib/common/uri';
 import { ConfirmDialog } from '@theia/core/lib/browser/dialogs';
+import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import { LibraryService, ResponseServiceClient } from '../../common/protocol';
-import { ExecuteWithProgress } from '../../common/protocol/progressible';
+import {
+  Installable,
+  LibraryService,
+  ResponseServiceArduino,
+} from '../../common/protocol';
 import {
   SketchContribution,
   Command,
@@ -15,19 +19,22 @@ import { nls } from '@theia/core/lib/common';
 
 @injectable()
 export class AddZipLibrary extends SketchContribution {
-  @inject(ResponseServiceClient)
-  private readonly responseService: ResponseServiceClient;
+  @inject(EnvVariablesServer)
+  protected readonly envVariableServer: EnvVariablesServer;
+
+  @inject(ResponseServiceArduino)
+  protected readonly responseService: ResponseServiceArduino;
 
   @inject(LibraryService)
-  private readonly libraryService: LibraryService;
+  protected readonly libraryService: LibraryService;
 
-  override registerCommands(registry: CommandRegistry): void {
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(AddZipLibrary.Commands.ADD_ZIP_LIBRARY, {
       execute: () => this.addZipLibrary(),
     });
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     const includeLibMenuPath = [
       ...ArduinoMenus.SKETCH__UTILS_GROUP,
       '0_include',
@@ -39,26 +46,23 @@ export class AddZipLibrary extends SketchContribution {
     });
   }
 
-  private async addZipLibrary(): Promise<void> {
+  async addZipLibrary(): Promise<void> {
     const homeUri = await this.envVariableServer.getHomeDirUri();
     const defaultPath = await this.fileService.fsPath(new URI(homeUri));
-    const { canceled, filePaths } = await remote.dialog.showOpenDialog(
-      remote.getCurrentWindow(),
-      {
-        title: nls.localize(
-          'arduino/selectZip',
-          "Select a zip file containing the library you'd like to add"
-        ),
-        defaultPath,
-        properties: ['openFile'],
-        filters: [
-          {
-            name: nls.localize('arduino/library/zipLibrary', 'Library'),
-            extensions: ['zip'],
-          },
-        ],
-      }
-    );
+    const { canceled, filePaths } = await remote.dialog.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 {
@@ -84,7 +88,7 @@ export class AddZipLibrary extends SketchContribution {
 
   private async doInstall(zipUri: string, overwrite?: boolean): Promise<void> {
     try {
-      await ExecuteWithProgress.doWithProgress({
+      await Installable.doWithProgress({
         messageService: this.messageService,
         progressText:
           nls.localize('arduino/common/processing', 'Processing') +

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

@@ -1,6 +1,7 @@
-import { injectable } from '@theia/core/shared/inversify';
+import { injectable } from 'inversify';
 import * as remote from '@theia/core/electron-shared/@electron/remote';
 import * as dateFormat from 'dateformat';
+import URI from '@theia/core/lib/common/uri';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import {
   SketchContribution,
@@ -9,17 +10,16 @@ import {
   MenuModelRegistry,
 } from './contribution';
 import { nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../sketches-service-client-impl';
 
 @injectable()
 export class ArchiveSketch extends SketchContribution {
-  override registerCommands(registry: CommandRegistry): void {
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(ArchiveSketch.Commands.ARCHIVE_SKETCH, {
       execute: () => this.archiveSketch(),
     });
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     registry.registerMenuAction(ArduinoMenus.TOOLS__MAIN_GROUP, {
       commandId: ArchiveSketch.Commands.ARCHIVE_SKETCH.id,
       label: nls.localize('arduino/sketch/archiveSketch', 'Archive Sketch'),
@@ -27,28 +27,28 @@ export class ArchiveSketch extends SketchContribution {
     });
   }
 
-  private async archiveSketch(): Promise<void> {
-    const sketch = await this.sketchServiceClient.currentSketch();
-    if (!CurrentSketch.isValid(sketch)) {
+  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 defaultContainerUri = await this.defaultUri();
-    const defaultUri = defaultContainerUri.resolve(archiveBasename);
-    const defaultPath = await this.fileService.fsPath(defaultUri);
-    const { filePath, canceled } = await remote.dialog.showSaveDialog(
-      remote.getCurrentWindow(),
-      {
-        title: nls.localize(
-          'arduino/sketch/saveSketchAs',
-          'Save sketch folder as...'
-        ),
-        defaultPath,
-      }
+    const defaultPath = await this.fileService.fsPath(
+      new URI(config.sketchDirUri).resolve(archiveBasename)
     );
+    const { filePath, canceled } = await remote.dialog.showSaveDialog({
+      title: nls.localize(
+        'arduino/sketch/saveSketchAs',
+        'Save sketch folder as...'
+      ),
+      defaultPath,
+    });
     if (!filePath || canceled) {
       return;
     }
@@ -56,7 +56,7 @@ export class ArchiveSketch extends SketchContribution {
     if (!destinationUri) {
       return;
     }
-    await this.sketchesService.archive(sketch, destinationUri.toString());
+    await this.sketchService.archive(sketch, destinationUri.toString());
     this.messageService.info(
       nls.localize(
         'arduino/sketch/createdArchive',

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

@@ -1,10 +1,11 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from 'inversify';
 import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { MenuModelRegistry } from '@theia/core/lib/common/menu';
 import {
   DisposableCollection,
   Disposable,
 } from '@theia/core/lib/common/disposable';
+import { firstToUpperCase } from '../../common/utils';
 import { BoardsConfig } from '../boards/boards-config';
 import { MainMenuManager } from '../../common/main-menu-manager';
 import { BoardsListWidget } from '../boards/boards-list-widget';
@@ -20,7 +21,6 @@ import {
   InstalledBoardWithPackage,
   AvailablePorts,
   Port,
-  getBoardInfo,
 } from '../../common/protocol';
 import { SketchContribution, Command, CommandRegistry } from './contribution';
 import { nls } from '@theia/core/lib/common';
@@ -47,49 +47,72 @@ export class BoardSelection extends SketchContribution {
 
   protected readonly toDisposeBeforeMenuRebuild = new DisposableCollection();
 
-  override registerCommands(registry: CommandRegistry): void {
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(BoardSelection.Commands.GET_BOARD_INFO, {
       execute: async () => {
-        const boardInfo = await getBoardInfo(
-          this.boardsServiceProvider.boardsConfig.selectedPort,
-          this.boardsService.getState()
-        );
-        if (typeof boardInfo === 'string') {
-          this.messageService.info(boardInfo);
+        const { selectedBoard, selectedPort } =
+          this.boardsServiceProvider.boardsConfig;
+        if (!selectedBoard) {
+          this.messageService.info(
+            nls.localize(
+              'arduino/board/selectBoardForInfo',
+              'Please select a board to obtain board info.'
+            )
+          );
           return;
         }
-        const { BN, VID, PID, SN } = boardInfo;
-        const detail = `
-BN: ${BN}
-VID: ${VID}
-PID: ${PID}
-SN: ${SN}
-`.trim();
-        await remote.dialog.showMessageBox(remote.getCurrentWindow(), {
-          message: nls.localize('arduino/board/boardInfo', 'Board Info'),
-          title: nls.localize('arduino/board/boardInfo', 'Board Info'),
-          type: 'info',
-          detail,
-          buttons: [nls.localize('vscode/issueMainService/ok', 'OK')],
+        if (!selectedBoard.fqbn) {
+          this.messageService.info(
+            nls.localize(
+              'arduino/board/platformMissing',
+              "The platform for the selected '{0}' board is not installed.",
+              selectedBoard.name
+            )
+          );
+          return;
+        }
+        if (!selectedPort) {
+          this.messageService.info(
+            nls.localize(
+              'arduino/board/selectPortForInfo',
+              'Please select a port to obtain board info.'
+            )
+          );
+          return;
+        }
+        const boardDetails = await this.boardsService.getBoardDetails({
+          fqbn: selectedBoard.fqbn,
         });
+        if (boardDetails) {
+          const { VID, PID } = boardDetails;
+          const detail = `BN: ${selectedBoard.name}
+VID: ${VID}
+PID: ${PID}`;
+          await remote.dialog.showMessageBox(remote.getCurrentWindow(), {
+            message: nls.localize('arduino/board/boardInfo', 'Board Info'),
+            title: nls.localize('arduino/board/boardInfo', 'Board Info'),
+            type: 'info',
+            detail,
+            buttons: [nls.localize('vscode/issueMainService/ok', 'OK')],
+          });
+        }
       },
     });
   }
 
-  override onStart(): void {
-    this.notificationCenter.onPlatformDidInstall(() => this.updateMenus());
-    this.notificationCenter.onPlatformDidUninstall(() => this.updateMenus());
-    this.boardsServiceProvider.onBoardsConfigChanged(() => this.updateMenus());
-    this.boardsServiceProvider.onAvailableBoardsChanged(() =>
-      this.updateMenus()
-    );
-    this.boardsServiceProvider.onAvailablePortsChanged(() =>
-      this.updateMenus()
-    );
-  }
-
-  override async onReady(): Promise<void> {
+  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)
+    );
+    this.boardsServiceProvider.onAvailablePortsChanged(
+      this.updateMenus.bind(this)
+    );
   }
 
   protected async updateMenus(): Promise<void> {
@@ -132,7 +155,10 @@ SN: ${SN}
     );
 
     // Ports submenu
-    const portsSubmenuPath = ArduinoMenus.TOOLS__PORTS_SUBMENU;
+    const portsSubmenuPath = [
+      ...ArduinoMenus.TOOLS__BOARD_SELECTION_GROUP,
+      '2_ports',
+    ];
     const portsSubmenuLabel = config.selectedPort?.address;
     this.menuModelRegistry.registerSubmenu(
       portsSubmenuPath,
@@ -173,15 +199,14 @@ SN: ${SN}
     });
 
     // Installed boards
-    installedBoards.forEach((board, index) => {
+    for (const board of installedBoards) {
       const { packageId, packageName, fqbn, name, manuallyInstalled } = board;
 
       const packageLabel =
         packageName +
-        `${
-          manuallyInstalled
-            ? nls.localize('arduino/board/inSketchbook', ' (in Sketchbook)')
-            : ''
+        `${manuallyInstalled
+          ? nls.localize('arduino/board/inSketchbook', ' (in Sketchbook)')
+          : ''
         }`;
       // Platform submenu
       const platformMenuPath = [...boardsPackagesGroup, packageId];
@@ -214,18 +239,14 @@ SN: ${SN}
       };
 
       // 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);
       // Note: we do not dispose the menu actions individually. Calling `unregisterSubmenu` on the parent will wipe the children menu nodes recursively.
-    });
+    }
 
     // Installed ports
     const registerPorts = (
@@ -245,12 +266,8 @@ SN: ${SN}
       ];
       const placeholder = new PlaceholderMenuNode(
         menuPath,
-        nls.localize(
-          'arduino/board/typeOfPorts',
-          '{0} ports',
-          Port.Protocols.protocolLabel(protocol)
-        ),
-        { order: protocolOrder.toString().padStart(4) }
+        `${firstToUpperCase(protocol)} ports`,
+        { order: protocolOrder.toString() }
       );
       this.menuModelRegistry.registerMenuNode(menuPath, placeholder);
       this.toDisposeBeforeMenuRebuild.push(
@@ -261,18 +278,16 @@ SN: ${SN}
 
       // First we show addresses with recognized boards connected,
       // then all the rest.
-      const sortedIDs = Object.keys(ports).sort(
-        (left: string, right: string): number => {
-          const [, leftBoards] = ports[left];
-          const [, rightBoards] = ports[right];
-          return rightBoards.length - leftBoards.length;
-        }
-      );
+      const sortedIDs = Object.keys(ports).sort((left: string, right: string): number => {
+        const [, leftBoards] = ports[left];
+        const [, rightBoards] = ports[right];
+        return rightBoards.length - leftBoards.length;
+      });
 
       for (let i = 0; i < sortedIDs.length; i++) {
         const portID = sortedIDs[i];
         const [port, boards] = ports[portID];
-        let label = `${port.addressLabel}`;
+        let label = `${port.address}`;
         if (boards.length) {
           const boardsList = boards.map((board) => board.name).join(', ');
           label = `${label} (${boardsList})`;
@@ -303,7 +318,7 @@ SN: ${SN}
         const menuAction = {
           commandId: id,
           label,
-          order: String(protocolOrder + i + 1).padStart(4),
+          order: `${protocolOrder + i + 1}`,
         };
         this.commandRegistry.registerCommand(command, handler);
         this.toDisposeBeforeMenuRebuild.push(
@@ -315,7 +330,7 @@ SN: ${SN}
       }
     };
 
-    const grouped = AvailablePorts.groupByProtocol(availablePorts);
+    const grouped = AvailablePorts.byProtocol(availablePorts);
     let protocolOrder = 100;
     // We first show serial and network ports, then all the rest
     ['serial', 'network'].forEach((protocol) => {
@@ -335,7 +350,7 @@ SN: ${SN}
   }
 
   protected async installedBoards(): Promise<InstalledBoardWithPackage[]> {
-    const allBoards = await this.boardsService.getInstalledBoards();
+    const allBoards = await this.boardsService.searchBoards({});
     return allBoards.filter(InstalledBoardWithPackage.is);
   }
 }

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

@@ -1,23 +1,39 @@
-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/browser/output-channel';
 import { CoreService } from '../../common/protocol';
 import { ArduinoMenus } from '../menu/arduino-menus';
+import { BoardsDataStore } from '../boards/boards-data-store';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
 import {
+  SketchContribution,
   Command,
   CommandRegistry,
-  CoreServiceContribution,
   MenuModelRegistry,
 } from './contribution';
+import { nls } from '@theia/core/lib/common';
 
 @injectable()
-export class BurnBootloader extends CoreServiceContribution {
-  override registerCommands(registry: CommandRegistry): void {
+export class BurnBootloader extends SketchContribution {
+  @inject(CoreService)
+  protected readonly coreService: CoreService;
+
+
+  @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(),
     });
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     registry.registerMenuAction(ArduinoMenus.TOOLS__BOARD_SETTINGS_GROUP, {
       commandId: BurnBootloader.Commands.BURN_BOOTLOADER.id,
       label: nls.localize(
@@ -28,20 +44,32 @@ export class BurnBootloader extends CoreServiceContribution {
     });
   }
 
-  private async burnBootloader(): Promise<void> {
-    this.clearVisibleNotification();
-    const options = await this.options();
+  async burnBootloader(): Promise<void> {
     try {
-      await this.doWithProgress({
-        progressText: nls.localize(
-          'arduino/bootloader/burningBootloader',
-          'Burning bootloader...'
-        ),
-        task: (progressId, coreService) =>
-          coreService.burnBootloader({
-            ...options,
-            progressId,
-          }),
+      const { boardsConfig } = this.boardsServiceClientImpl;
+      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'),
+        ]);
+
+      const board = {
+        ...boardsConfig.selectedBoard,
+        name: boardsConfig.selectedBoard?.name || '',
+        fqbn,
+      }
+      this.outputChannelManager.getChannel('Arduino').clear();
+      await this.coreService.burnBootloader({
+        board,
+        programmer,
+        port,
+        verify,
+        verbose,
       });
       this.messageService.info(
         nls.localize(
@@ -53,30 +81,15 @@ export class BurnBootloader extends CoreServiceContribution {
         }
       );
     } catch (e) {
-      this.handleError(e);
+      let errorMessage = "";
+      if (typeof e === "string") {
+        errorMessage = e;
+      } else {
+        errorMessage = e.toString();
+      }
+      this.messageService.error(errorMessage);
     }
   }
-
-  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 {

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

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

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

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

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

@@ -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))
-        .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,23 +1,15 @@
-import {
-  inject,
-  injectable,
-  interfaces,
-  postConstruct,
-} from '@theia/core/shared/inversify';
+import { inject, injectable, interfaces } from 'inversify';
 import URI from '@theia/core/lib/common/uri';
 import { ILogger } from '@theia/core/lib/common/logger';
-import {
-  Disposable,
-  DisposableCollection,
-} from '@theia/core/lib/common/disposable';
 import { Saveable } from '@theia/core/lib/browser/saveable';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { MaybePromise } from '@theia/core/lib/common/types';
 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 { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
+import { WorkspaceService } from '@theia/workspace/lib/browser/workspace-service';
 import { open, OpenerService } from '@theia/core/lib/browser/opener-service';
+import { OutputChannelManager } from '@theia/output/lib/browser/output-channel';
 import {
   MenuModelRegistry,
   MenuContribution,
@@ -40,33 +32,16 @@ import {
   CommandContribution,
   CommandService,
 } from '@theia/core/lib/common/command';
+import { EditorMode } from '../editor-mode';
 import { SettingsService } from '../dialogs/settings/settings';
-import {
-  CurrentSketch,
-  SketchesServiceClientImpl,
-} from '../sketches-service-client-impl';
+import { SketchesServiceClientImpl } from '../../common/protocol/sketches-service-client-impl';
 import {
   SketchesService,
+  ConfigService,
   FileSystemExt,
   Sketch,
-  CoreService,
-  CoreError,
-  ResponseServiceClient,
 } from '../../common/protocol';
 import { ArduinoPreferences } from '../arduino-preferences';
-import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
-import { nls } from '@theia/core';
-import { OutputChannelManager } from '../theia/output/output-channel';
-import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
-import { ExecuteWithProgress } from '../../common/protocol/progressible';
-import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import { BoardsDataStore } from '../boards/boards-data-store';
-import { NotificationManager } from '@theia/messages/lib/browser/notifications-manager';
-import { MessageType } from '@theia/core/lib/common/message-service-protocol';
-import { WorkspaceService } from '../theia/workspace/workspace-service';
-import { MainMenuManager } from '../../common/main-menu-manager';
-import { ConfigServiceClient } from '../config/config-service-client';
-import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
 
 export {
   Command,
@@ -100,43 +75,24 @@ export abstract class Contribution
   @inject(WorkspaceService)
   protected readonly workspaceService: WorkspaceService;
 
+  @inject(EditorMode)
+  protected readonly editorMode: EditorMode;
+
   @inject(LabelProvider)
   protected readonly labelProvider: LabelProvider;
 
   @inject(SettingsService)
   protected readonly settingsService: SettingsService;
 
-  @inject(ArduinoPreferences)
-  protected readonly preferences: ArduinoPreferences;
-
-  @inject(FrontendApplicationStateService)
-  protected readonly appStateService: FrontendApplicationStateService;
-
-  @inject(MainMenuManager)
-  protected readonly menuManager: MainMenuManager;
-
-  @postConstruct()
-  protected init(): void {
-    this.appStateService.reachedState('ready').then(() => this.onReady());
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function, unused-imports/no-unused-vars
   onStart(app: FrontendApplication): MaybePromise<void> {}
 
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/no-empty-function, unused-imports/no-unused-vars
   registerCommands(registry: CommandRegistry): 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()
@@ -147,11 +103,11 @@ export abstract class SketchContribution extends Contribution {
   @inject(FileSystemExt)
   protected readonly fileSystemExt: FileSystemExt;
 
-  @inject(ConfigServiceClient)
-  protected readonly configService: ConfigServiceClient;
+  @inject(ConfigService)
+  protected readonly configService: ConfigService;
 
   @inject(SketchesService)
-  protected readonly sketchesService: SketchesService;
+  protected readonly sketchService: SketchesService;
 
   @inject(OpenerService)
   protected readonly openerService: OpenerService;
@@ -159,19 +115,19 @@ export abstract class SketchContribution extends Contribution {
   @inject(SketchesServiceClientImpl)
   protected readonly sketchServiceClient: SketchesServiceClientImpl;
 
+  @inject(ArduinoPreferences)
+  protected readonly preferences: ArduinoPreferences;
+
   @inject(EditorManager)
   protected readonly editorManager: EditorManager;
 
   @inject(OutputChannelManager)
   protected readonly outputChannelManager: OutputChannelManager;
 
-  @inject(EnvVariablesServer)
-  protected readonly envVariableServer: EnvVariablesServer;
-
   protected async sourceOverride(): Promise<Record<string, string>> {
     const override: Record<string, string> = {};
     const sketch = await this.sketchServiceClient.currentSketch();
-    if (CurrentSketch.isValid(sketch)) {
+    if (sketch) {
       for (const editor of this.editorManager.all) {
         const uri = editor.editor.uri;
         if (Saveable.isDirty(editor) && Sketch.isInSketch(uri, sketch)) {
@@ -181,155 +137,10 @@ export abstract class SketchContribution extends Contribution {
     }
     return override;
   }
-
-  /**
-   * Defaults to `directories.user` if defined and not CLI config errors were detected.
-   * Otherwise, the URI of the user home directory.
-   */
-  protected async defaultUri(): Promise<URI> {
-    const errors = this.configService.tryGetMessages();
-    let defaultUri = this.configService.tryGetSketchDirUri();
-    if (!defaultUri || errors?.length) {
-      // Fall back to user home when the `directories.user` is not available or there are known CLI config errors
-      defaultUri = new URI(await this.envVariableServer.getHomeDirUri());
-    }
-    return defaultUri;
-  }
-
-  protected async defaultPath(): Promise<string> {
-    const defaultUri = await this.defaultUri();
-    return this.fileService.fsPath(defaultUri);
-  }
-}
-
-@injectable()
-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 {
-    this.tryToastErrorMessage(error);
-  }
-
-  private tryToastErrorMessage(error: unknown): void {
-    let message: undefined | string = undefined;
-    if (CoreError.is(error)) {
-      message = error.message;
-    } else if (error instanceof Error) {
-      message = error.message;
-    } else if (typeof error === 'string') {
-      message = error;
-    } else {
-      try {
-        message = JSON.stringify(error);
-      } catch {}
-    }
-    if (message) {
-      if (message.includes('Missing FQBN (Fully Qualified Board Name)')) {
-        message = nls.localize(
-          'arduino/coreContribution/noBoardSelected',
-          'No board selected. Please select your Arduino board from the Tools > Board menu.'
-        );
-      }
-      const copyAction = nls.localize(
-        'arduino/coreContribution/copyError',
-        'Copy error messages'
-      );
-      this.visibleNotificationId = this.notificationId(message, copyAction);
-      this.messageService.error(message, copyAction).then(async (action) => {
-        if (action === copyAction) {
-          const content = await this.outputChannelManager.contentOfChannel(
-            'Arduino'
-          );
-          if (content) {
-            this.clipboardService.writeText(content);
-          }
-        }
-      });
-    } else {
-      throw error;
-    }
-  }
-
-  protected async doWithProgress<T>(options: {
-    progressText: string;
-    keepOutput?: boolean;
-    task: (progressId: string, coreService: CoreService) => Promise<T>;
-  }): Promise<T> {
-    const 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 }) => task(progressId, this.coreService),
-      keepOutput,
-    });
-    toDisposeOnComplete.dispose();
-    return result;
-  }
-
-  // TODO: cleanup!
-  // this dependency does not belong here
-  // support core command contribution handlers, the monitor-widget should implement it and register itself as a handler
-  // the monitor widget should reveal itself after a successful core command execution
-  private maybeActivateMonitorWidget(): Disposable {
-    const currentWidget = this.shell.bottomPanel.currentTitle?.owner;
-    if (currentWidget?.id === 'serial-monitor') {
-      return Disposable.create(() =>
-        this.shell.bottomPanel.activateWidget(currentWidget)
-      );
-    }
-    return Disposable.NULL;
-  }
-
-  private notificationId(message: string, ...actions: string[]): string {
-    return this.notificationManager['getMessageId']({
-      text: message,
-      actions,
-      type: MessageType.Error,
-    });
-  }
 }
 
 export namespace Contribution {
-  export function configure(
+  export function configure<T>(
     bind: interfaces.Bind,
     serviceIdentifier: typeof Contribution
   ): void {

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,14 +1,9 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from 'inversify';
 import { Event, Emitter } from '@theia/core/lib/common/event';
 import { HostedPluginSupport } from '@theia/plugin-ext/lib/hosted/browser/hosted-plugin';
 import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import { NotificationCenter } from '../notification-center';
-import {
-  Board,
-  BoardsService,
-  ExecutableService,
-  Sketch,
-} from '../../common/protocol';
+import { Board, BoardsService, ExecutableService } from '../../common/protocol';
 import { BoardsServiceProvider } from '../boards/boards-service-provider';
 import {
   URI,
@@ -17,49 +12,45 @@ import {
   SketchContribution,
   TabBarToolbarRegistry,
 } from './contribution';
-import { MaybePromise, MenuModelRegistry, nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../sketches-service-client-impl';
-import { ArduinoMenus } from '../menu/arduino-menus';
-
-const COMPILE_FOR_DEBUG_KEY = 'arduino-compile-for-debug';
+import { nls } from '@theia/core/lib/common';
 
 @injectable()
 export class Debug extends SketchContribution {
   @inject(HostedPluginSupport)
-  private readonly hostedPluginSupport: HostedPluginSupport;
+  protected hostedPluginSupport: HostedPluginSupport;
 
   @inject(NotificationCenter)
-  private readonly notificationCenter: NotificationCenter;
+  protected readonly notificationCenter: NotificationCenter;
 
   @inject(ExecutableService)
-  private readonly executableService: ExecutableService;
+  protected readonly executableService: ExecutableService;
 
   @inject(BoardsService)
-  private readonly boardService: BoardsService;
+  protected readonly boardService: BoardsService;
 
   @inject(BoardsServiceProvider)
-  private readonly boardsServiceProvider: BoardsServiceProvider;
+  protected readonly boardsServiceProvider: BoardsServiceProvider;
 
   /**
    * If `undefined`, debugging is enabled. Otherwise, the reason why it's disabled.
    */
-  private _disabledMessages?: string = nls.localize(
+  protected _disabledMessages?: string = nls.localize(
     'arduino/common/noBoardSelected',
     'No board selected'
   ); // Initial pessimism.
-  private disabledMessageDidChangeEmitter = new Emitter<string | undefined>();
-  private onDisabledMessageDidChange =
+  protected disabledMessageDidChangeEmitter = new Emitter<string | undefined>();
+  protected onDisabledMessageDidChange =
     this.disabledMessageDidChangeEmitter.event;
 
-  private get disabledMessage(): string | undefined {
+  protected get disabledMessage(): string | undefined {
     return this._disabledMessages;
   }
-  private set disabledMessage(message: string | undefined) {
+  protected set disabledMessage(message: string | undefined) {
     this._disabledMessages = message;
     this.disabledMessageDidChangeEmitter.fire(this._disabledMessages);
   }
 
-  private readonly debugToolbarItem = {
+  protected readonly debugToolbarItem = {
     id: Debug.Commands.START_DEBUGGING.id,
     command: Debug.Commands.START_DEBUGGING.id,
     tooltip: `${
@@ -75,7 +66,7 @@ export class Debug extends SketchContribution {
     onDidChange: this.onDisabledMessageDidChange as Event<void>,
   };
 
-  override onStart(): void {
+  onStart(): void {
     this.onDisabledMessageDidChange(
       () =>
         (this.debugToolbarItem.tooltip = `${
@@ -88,87 +79,68 @@ export class Debug extends SketchContribution {
             : Debug.Commands.START_DEBUGGING.label
         }`)
     );
+    const refreshState = async (
+      board: Board | undefined = this.boardsServiceProvider.boardsConfig
+        .selectedBoard
+    ) => {
+      if (!board) {
+        this.disabledMessage = nls.localize(
+          'arduino/common/noBoardSelected',
+          'No board selected'
+        );
+        return;
+      }
+      const fqbn = board.fqbn;
+      if (!fqbn) {
+        this.disabledMessage = nls.localize(
+          'arduino/debug/noPlatformInstalledFor',
+          "Platform is not installed for '{0}'",
+          board.name
+        );
+        return;
+      }
+      const details = await this.boardService.getBoardDetails({ fqbn });
+      if (!details) {
+        this.disabledMessage = nls.localize(
+          'arduino/debug/noPlatformInstalledFor',
+          "Platform is not installed for '{0}'",
+          board.name
+        );
+        return;
+      }
+      const { debuggingSupported } = details;
+      if (!debuggingSupported) {
+        this.disabledMessage = nls.localize(
+          'arduino/debug/debuggingNotSupported',
+          "Debugging is not supported by '{0}'",
+          board.name
+        );
+      } else {
+        this.disabledMessage = undefined;
+      }
+    };
     this.boardsServiceProvider.onBoardsConfigChanged(({ selectedBoard }) =>
-      this.refreshState(selectedBoard)
+      refreshState(selectedBoard)
     );
-    this.notificationCenter.onPlatformDidInstall(() => this.refreshState());
-    this.notificationCenter.onPlatformDidUninstall(() => this.refreshState());
+    this.notificationCenter.onPlatformInstalled(() => refreshState());
+    this.notificationCenter.onPlatformUninstalled(() => refreshState());
+    refreshState();
   }
 
-  override onReady(): MaybePromise<void> {
-    this.refreshState();
-  }
-
-  override registerCommands(registry: CommandRegistry): void {
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(Debug.Commands.START_DEBUGGING, {
       execute: () => this.startDebug(),
       isVisible: (widget) =>
         ArduinoToolbar.is(widget) && widget.side === 'left',
       isEnabled: () => !this.disabledMessage,
     });
-    registry.registerCommand(Debug.Commands.TOGGLE_OPTIMIZE_FOR_DEBUG, {
-      execute: () => this.toggleCompileForDebug(),
-      isToggled: () => this.compileForDebug,
-    });
-    registry.registerCommand(Debug.Commands.IS_OPTIMIZE_FOR_DEBUG, {
-      execute: () => this.compileForDebug,
-    });
   }
 
-  override registerToolbarItems(registry: TabBarToolbarRegistry): void {
+  registerToolbarItems(registry: TabBarToolbarRegistry): void {
     registry.registerItem(this.debugToolbarItem);
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
-    registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
-      commandId: Debug.Commands.TOGGLE_OPTIMIZE_FOR_DEBUG.id,
-      label: Debug.Commands.TOGGLE_OPTIMIZE_FOR_DEBUG.label,
-      order: '5',
-    });
-  }
-
-  private async refreshState(
-    board: Board | undefined = this.boardsServiceProvider.boardsConfig
-      .selectedBoard
-  ): Promise<void> {
-    if (!board) {
-      this.disabledMessage = nls.localize(
-        'arduino/common/noBoardSelected',
-        'No board selected'
-      );
-      return;
-    }
-    const fqbn = board.fqbn;
-    if (!fqbn) {
-      this.disabledMessage = nls.localize(
-        'arduino/debug/noPlatformInstalledFor',
-        "Platform is not installed for '{0}'",
-        board.name
-      );
-      return;
-    }
-    const details = await this.boardService.getBoardDetails({ fqbn });
-    if (!details) {
-      this.disabledMessage = nls.localize(
-        'arduino/debug/noPlatformInstalledFor',
-        "Platform is not installed for '{0}'",
-        board.name
-      );
-      return;
-    }
-    const { debuggingSupported } = details;
-    if (!debuggingSupported) {
-      this.disabledMessage = nls.localize(
-        'arduino/debug/debuggingNotSupported',
-        "Debugging is not supported by '{0}'",
-        board.name
-      );
-    } else {
-      this.disabledMessage = undefined;
-    }
-  }
-
-  private async startDebug(
+  protected async startDebug(
     board: Board | undefined = this.boardsServiceProvider.boardsConfig
       .selectedBoard
   ): Promise<void> {
@@ -184,10 +156,10 @@ export class Debug extends SketchContribution {
       this.sketchServiceClient.currentSketch(),
       this.executableService.list(),
     ]);
-    if (!CurrentSketch.isValid(sketch)) {
+    if (!sketch) {
       return;
     }
-    const ideTempFolderUri = await this.sketchesService.getIdeTempFolderUri(
+    const ideTempFolderUri = await this.sketchService.getIdeTempFolderUri(
       sketch
     );
     const [cliPath, sketchPath, configPath] = await Promise.all([
@@ -204,59 +176,10 @@ export class Debug extends SketchContribution {
       sketchPath,
       configPath,
     };
-    try {
-      await this.commandService.executeCommand('arduino.debug.start', config);
-    } catch (err) {
-      if (await this.isSketchNotVerifiedError(err, sketch)) {
-        const yes = nls.localize('vscode/extensionsUtils/yes', 'Yes');
-        const answer = await this.messageService.error(
-          nls.localize(
-            'arduino/debug/sketchIsNotCompiled',
-            "Sketch '{0}' must be verified before starting a debug session. Please verify the sketch and start debugging again. Do you want to verify the sketch now?",
-            sketch.name
-          ),
-          yes
-        );
-        if (answer === yes) {
-          this.commandService.executeCommand('arduino-verify-sketch');
-        }
-      } else {
-        this.messageService.error(
-          err instanceof Error ? err.message : String(err)
-        );
-      }
-    }
-  }
-
-  get compileForDebug(): boolean {
-    const value = window.localStorage.getItem(COMPILE_FOR_DEBUG_KEY);
-    return value === 'true';
-  }
-
-  async toggleCompileForDebug(): Promise<void> {
-    const oldState = this.compileForDebug;
-    const newState = !oldState;
-    window.localStorage.setItem(COMPILE_FOR_DEBUG_KEY, String(newState));
-    this.menuManager.update();
-  }
-
-  private async isSketchNotVerifiedError(
-    err: unknown,
-    sketch: Sketch
-  ): Promise<boolean> {
-    if (err instanceof Error) {
-      try {
-        const tempBuildPaths = await this.sketchesService.tempBuildPath(sketch);
-        return tempBuildPaths.some((tempBuildPath) =>
-          err.message.includes(tempBuildPath)
-        );
-      } catch {
-        return false;
-      }
-    }
-    return false;
+    return this.commandService.executeCommand('arduino.debug.start', config);
   }
 }
+
 export namespace Debug {
   export namespace Commands {
     export const START_DEBUGGING = Command.toLocalizedCommand(
@@ -267,16 +190,5 @@ export namespace Debug {
       },
       'vscode/debug.contribution/startDebuggingHelp'
     );
-    export const TOGGLE_OPTIMIZE_FOR_DEBUG = Command.toLocalizedCommand(
-      {
-        id: 'arduino-toggle-optimize-for-debug',
-        label: 'Optimize for Debugging',
-        category: 'Arduino',
-      },
-      'arduino/debug/optimizeForDebugging'
-    );
-    export const IS_OPTIMIZE_FOR_DEBUG: Command = {
-      id: 'arduino-is-optimize-for-debug',
-    };
   }
 }

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

@@ -1,168 +0,0 @@
-import * as remote from '@theia/core/electron-shared/@electron/remote';
-import { ipcRenderer } from '@theia/core/electron-shared/electron';
-import { Dialog } from '@theia/core/lib/browser/dialogs';
-import { NavigatableWidget } from '@theia/core/lib/browser/navigatable-types';
-import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
-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 { SCHEDULE_DELETION_SIGNAL } from '../../electron-common/electron-messages';
-import { Sketch } from '../contributions/contribution';
-import { isNotFound } from '../create/typings';
-import { Command, CommandRegistry } from './contribution';
-import { CloudSketchContribution } from './cloud-contribution';
-
-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;
-
-  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 remote.dialog.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 {
-    ipcRenderer.send(SCHEDULE_DELETION_SIGNAL, 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,6 +1,7 @@
-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 { PreferenceService } from '@theia/core/lib/browser/preferences/preference-service';
 import { MonacoEditorService } from '@theia/monaco/lib/browser/monaco-editor-service';
 import {
   Contribution,
@@ -11,20 +12,21 @@ import {
 } from './contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { nls } from '@theia/core/lib/common';
-import type { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
-import type { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
 
 // TODO: [macOS]: to remove `Start Dictation...` and `Emoji & Symbol` see this thread: https://github.com/electron/electron/issues/8283#issuecomment-269522072
 // Depends on https://github.com/eclipse-theia/theia/pull/7964
 @injectable()
 export class EditContributions extends Contribution {
   @inject(MonacoEditorService)
-  private readonly codeEditorService: MonacoEditorService;
+  protected readonly codeEditorService: MonacoEditorService;
 
   @inject(ClipboardService)
-  private readonly clipboardService: ClipboardService;
+  protected readonly clipboardService: ClipboardService;
 
-  override registerCommands(registry: CommandRegistry): void {
+  @inject(PreferenceService)
+  protected readonly preferences: PreferenceService;
+
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(EditContributions.Commands.GO_TO_LINE, {
       execute: () => this.run('editor.action.gotoLine'),
     });
@@ -49,6 +51,30 @@ export class EditContributions extends Contribution {
     registry.registerCommand(EditContributions.Commands.USE_FOR_FIND, {
       execute: () => this.run('editor.action.previousSelectionMatchFindAction'),
     });
+    registry.registerCommand(EditContributions.Commands.INCREASE_FONT_SIZE, {
+      execute: async () => {
+        const settings = await this.settingsService.settings();
+        if (settings.autoScaleInterface) {
+          settings.interfaceScale = settings.interfaceScale + 1;
+        } else {
+          settings.editorFontSize = settings.editorFontSize + 1;
+        }
+        await this.settingsService.update(settings);
+        await this.settingsService.save();
+      },
+    });
+    registry.registerCommand(EditContributions.Commands.DECREASE_FONT_SIZE, {
+      execute: async () => {
+        const settings = await this.settingsService.settings();
+        if (settings.autoScaleInterface) {
+          settings.interfaceScale = settings.interfaceScale - 1;
+        } else {
+          settings.editorFontSize = settings.editorFontSize - 1;
+        }
+        await this.settingsService.update(settings);
+        await this.settingsService.save();
+      },
+    });
     /* Tools */ registry.registerCommand(
       EditContributions.Commands.AUTO_FORMAT,
       { execute: () => this.run('editor.action.formatDocument') }
@@ -57,17 +83,15 @@ export class EditContributions extends Contribution {
       execute: async () => {
         const value = await this.currentValue();
         if (value !== undefined) {
-          this.clipboardService.writeText(`
-\`\`\`cpp
+          this.clipboardService.writeText(`\`\`\`cpp
 ${value}
-\`\`\`
-`);
+\`\`\``);
         }
       },
     });
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     registry.registerMenuAction(ArduinoMenus.EDIT__TEXT_CONTROL_GROUP, {
       commandId: CommonCommands.CUT.id,
       order: '0',
@@ -119,10 +143,22 @@ ${value}
       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__FONT_CONTROL_GROUP, {
+      commandId: EditContributions.Commands.INCREASE_FONT_SIZE.id,
+      label: nls.localize(
+        'arduino/editor/increaseFontSize',
+        'Increase Font Size'
+      ),
+      order: '0',
+    });
+    registry.registerMenuAction(ArduinoMenus.EDIT__FONT_CONTROL_GROUP, {
+      commandId: EditContributions.Commands.DECREASE_FONT_SIZE.id,
+      label: nls.localize(
+        'arduino/editor/decreaseFontSize',
+        'Decrease Font Size'
+      ),
+      order: '1',
     });
 
     registry.registerMenuAction(ArduinoMenus.EDIT__FIND_GROUP, {
@@ -163,7 +199,7 @@ ${value}
     });
   }
 
-  override registerKeybindings(registry: KeybindingRegistry): void {
+  registerKeybindings(registry: KeybindingRegistry): void {
     registry.registerKeybinding({
       command: EditContributions.Commands.COPY_FOR_FORUM.id,
       keybinding: 'CtrlCmd+Shift+C',
@@ -181,6 +217,15 @@ ${value}
       when: 'editorFocus',
     });
 
+    registry.registerKeybinding({
+      command: EditContributions.Commands.INCREASE_FONT_SIZE.id,
+      keybinding: 'CtrlCmd+=',
+    });
+    registry.registerKeybinding({
+      command: EditContributions.Commands.DECREASE_FONT_SIZE.id,
+      keybinding: 'CtrlCmd+-',
+    });
+
     registry.registerKeybinding({
       command: EditContributions.Commands.FIND.id,
       keybinding: 'CtrlCmd+F',
@@ -205,13 +250,10 @@ ${value}
     });
   }
 
-  protected async current(): Promise<
-    ICodeEditor | StandaloneCodeEditor | undefined
-  > {
+  protected async current(): Promise<monaco.editor.ICodeEditor | undefined> {
     return (
       this.codeEditorService.getFocusedCodeEditor() ||
-      this.codeEditorService.getActiveCodeEditor() ||
-      undefined
+      this.codeEditorService.getActiveCodeEditor()
     );
   }
 
@@ -267,6 +309,12 @@ export namespace EditContributions {
     export const USE_FOR_FIND: Command = {
       id: 'arduino-for-find',
     };
+    export const INCREASE_FONT_SIZE: Command = {
+      id: 'arduino-increase-font-size',
+    };
+    export const DECREASE_FONT_SIZE: Command = {
+      id: 'arduino-decrease-font-size',
+    };
     export const AUTO_FORMAT: Command = {
       id: 'arduino-auto-format', // `Auto Format` should belong to `Tool`.
     };

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

@@ -1,6 +1,6 @@
 import * as PQueue from 'p-queue';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { CommandHandler, CommandService } from '@theia/core/lib/common/command';
+import { inject, injectable, postConstruct } from 'inversify';
+import { CommandHandler } from '@theia/core/lib/common/command';
 import {
   MenuPath,
   CompositeMenuNode,
@@ -11,11 +11,8 @@ import {
   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 {
@@ -24,125 +21,40 @@ import {
   MenuModelRegistry,
 } from './contribution';
 import { NotificationCenter } from '../notification-center';
-import {
-  Board,
-  SketchRef,
-  SketchContainer,
-  SketchesError,
-  CoreService,
-  SketchesService,
-  Sketch,
-} 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, Sketch, SketchContainer } from '../../common/protocol';
+import { nls } from '@theia/core/lib/common';
 
 @injectable()
 export abstract class Examples extends SketchContribution {
   @inject(CommandRegistry)
-  private readonly commandRegistry: CommandRegistry;
+  protected readonly commandRegistry: CommandRegistry;
 
   @inject(MenuModelRegistry)
   protected readonly menuRegistry: MenuModelRegistry;
 
+  @inject(MainMenuManager)
+  protected readonly menuManager: MainMenuManager;
+
   @inject(ExamplesService)
   protected readonly examplesService: ExamplesService;
 
-  @inject(CoreService)
-  protected readonly coreService: CoreService;
-
   @inject(BoardsServiceProvider)
   protected readonly boardsServiceClient: BoardsServiceProvider;
 
-  @inject(NotificationCenter)
-  protected readonly notificationCenter: NotificationCenter;
-
   protected readonly toDispose = new DisposableCollection();
 
-  protected override init(): void {
-    super.init();
+  @postConstruct()
+  init(): void {
     this.boardsServiceClient.onBoardsConfigChanged(({ selectedBoard }) =>
       this.handleBoardChanged(selectedBoard)
     );
-    this.notificationCenter.onDidReinitialize(() =>
-      this.update({
-        board: this.boardsServiceClient.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?: Board | undefined;
-    forceRefresh?: boolean;
-  }): void;
-
-  override registerMenus(registry: MenuModelRegistry): void {
+  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;
@@ -160,7 +72,7 @@ export abstract class Examples extends SketchContribution {
     // TODO: unregister submenu? https://github.com/eclipse-theia/theia/issues/7300
     registry.registerSubmenu(
       ArduinoMenus.FILE__EXAMPLES_SUBMENU,
-      examplesLabel,
+      nls.localize('arduino/examples/menu', 'Examples'),
       {
         order: '4',
       }
@@ -170,7 +82,7 @@ export abstract class Examples extends SketchContribution {
   registerRecursively(
     sketchContainerOrPlaceholder:
       | SketchContainer
-      | (SketchRef | SketchContainer)[]
+      | (Sketch | SketchContainer)[]
       | string,
     menuPath: MenuPath,
     pushToDispose: DisposableCollection = new DisposableCollection(),
@@ -188,7 +100,7 @@ export abstract class Examples extends SketchContribution {
         )
       );
     } else {
-      const sketches: SketchRef[] = [];
+      const sketches: Sketch[] = [];
       const children: SketchContainer[] = [];
       let submenuPath = menuPath;
 
@@ -196,11 +108,6 @@ export abstract class Examples extends SketchContribution {
         const { label } = sketchContainerOrPlaceholder;
         submenuPath = [...menuPath, label];
         this.menuRegistry.registerSubmenu(submenuPath, label, subMenuOptions);
-        this.toDispose.push(
-          Disposable.create(() =>
-            unregisterSubmenu(submenuPath, this.menuRegistry)
-          )
-        );
         sketches.push(...sketchContainerOrPlaceholder.sketches);
         children.push(...sketchContainerOrPlaceholder.children);
       } else {
@@ -240,29 +147,12 @@ export abstract class Examples extends SketchContribution {
   }
 
   protected createHandler(uri: string): CommandHandler {
-    const forceUpdate = () =>
-      this.update({
-        board: this.boardsServiceClient.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();
-            },
-          }
+        const sketch = await this.sketchService.cloneExample(uri);
+        return this.commandService.executeCommand(
+          OpenSketch.Commands.OPEN_SKETCH.id,
+          sketch
         );
       },
     };
@@ -271,11 +161,11 @@ export abstract class Examples extends SketchContribution {
 
 @injectable()
 export class BuiltInExamples extends Examples {
-  override async onReady(): Promise<void> {
-    this.update(); // no `await`
+  onStart(): void {
+    this.register(); // no `await`
   }
 
-  protected override async update(): Promise<void> {
+  protected async register(): Promise<void> {
     let sketchContainers: SketchContainer[] | undefined;
     try {
       sketchContainers = await this.examplesService.builtIns();
@@ -306,32 +196,27 @@ export class BuiltInExamples extends Examples {
 
 @injectable()
 export class LibraryExamples extends Examples {
-  private readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
+  @inject(NotificationCenter)
+  protected readonly notificationCenter: NotificationCenter;
 
-  override onStart(): void {
-    this.notificationCenter.onLibraryDidInstall(() => this.update());
-    this.notificationCenter.onLibraryDidUninstall(() => this.update());
+  protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
+
+  onStart(): void {
+    this.register(); // no `await`
+    this.notificationCenter.onLibraryInstalled(() => this.register());
+    this.notificationCenter.onLibraryUninstalled(() => this.register());
   }
 
-  override async onReady(): Promise<void> {
-    this.update(); // no `await`
+  protected handleBoardChanged(board: Board | undefined): void {
+    this.register(board);
   }
 
-  protected override handleBoardChanged(board: Board | undefined): void {
-    this.update({ board });
-  }
-
-  protected override async update(
-    options: { board?: Board; forceRefresh?: boolean } = {
-      board: this.boardsServiceClient.boardsConfig.selectedBoard,
-    }
+  protected async register(
+    board: Board | undefined = this.boardsServiceClient.boardsConfig
+      .selectedBoard
   ): Promise<void> {
-    const { board, forceRefresh } = options;
     return this.queue.add(async () => {
       this.toDispose.dispose();
-      if (forceRefresh) {
-        await this.coreService.refresh();
-      }
       const fqbn = board?.fqbn;
       const name = board?.name;
       // Shows all examples when no board is selected, or the platform of the currently selected board is not installed.

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

@@ -1,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,4 +1,4 @@
-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';
@@ -15,7 +15,6 @@ import {
 import { nls } from '@theia/core/lib/common';
 import { IDEUpdaterCommands } from '../ide-updater/ide-updater-commands';
 import { ElectronCommands } from '@theia/core/lib/electron-browser/menu/electron-menu-contribution';
-import * as monaco from '@theia/monaco-editor-core';
 
 @injectable()
 export class Help extends Contribution {
@@ -28,7 +27,7 @@ export class Help extends Contribution {
   @inject(QuickInputService)
   protected readonly quickInputService: QuickInputService;
 
-  override registerCommands(registry: CommandRegistry): void {
+  registerCommands(registry: CommandRegistry): void {
     const open = (url: string) =>
       this.windowService.openNewWindow(url, { external: true });
     const createOpenHandler = (url: string) =>
@@ -41,9 +40,7 @@ export class Help extends Contribution {
     );
     registry.registerCommand(
       Help.Commands.ENVIRONMENT,
-      createOpenHandler(
-        'https://docs.arduino.cc/software/ide-v2/tutorials/getting-started-ide-v2'
-      )
+      createOpenHandler('https://www.arduino.cc/en/Guide/Environment')
     );
     registry.registerCommand(
       Help.Commands.TROUBLESHOOTING,
@@ -94,7 +91,7 @@ export class Help extends Contribution {
     );
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     registry.unregisterMenuAction({
       commandId: ElectronCommands.TOGGLE_DEVELOPER_TOOLS.id,
     });
@@ -138,7 +135,7 @@ export class Help extends Contribution {
     });
   }
 
-  override registerKeybindings(registry: KeybindingRegistry): void {
+  registerKeybindings(registry: KeybindingRegistry): void {
     registry.registerKeybinding({
       command: Help.Commands.FIND_IN_REFERENCE.id,
       keybinding: 'CtrlCmd+Shift+F',

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

@@ -1,5 +1,5 @@
 import * as PQueue from 'p-queue';
-import { inject, injectable } from '@theia/core/shared/inversify';
+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';
@@ -16,8 +16,6 @@ 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 {
@@ -31,7 +29,7 @@ export class IncludeLibrary extends SketchContribution {
   protected readonly mainMenuManager: MainMenuManager;
 
   @inject(EditorManager)
-  protected override readonly editorManager: EditorManager;
+  protected readonly editorManager: EditorManager;
 
   @inject(NotificationCenter)
   protected readonly notificationCenter: NotificationCenter;
@@ -45,22 +43,18 @@ export class IncludeLibrary extends SketchContribution {
   protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
   protected readonly toDispose = new DisposableCollection();
 
-  override onStart(): void {
+  onStart(): void {
+    this.updateMenuActions();
     this.boardsServiceClient.onBoardsConfigChanged(() =>
       this.updateMenuActions()
     );
-    this.notificationCenter.onLibraryDidInstall(() => this.updateMenuActions());
-    this.notificationCenter.onLibraryDidUninstall(() =>
+    this.notificationCenter.onLibraryInstalled(() => this.updateMenuActions());
+    this.notificationCenter.onLibraryUninstalled(() =>
       this.updateMenuActions()
     );
-    this.notificationCenter.onDidReinitialize(() => this.updateMenuActions());
   }
 
-  override async onReady(): Promise<void> {
-    this.updateMenuActions();
-  }
-
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     // `Include Library` submenu
     const includeLibMenuPath = [
       ...ArduinoMenus.SKETCH__UTILS_GROUP,
@@ -83,7 +77,7 @@ export class IncludeLibrary extends SketchContribution {
     });
   }
 
-  override registerCommands(registry: CommandRegistry): void {
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(IncludeLibrary.Commands.INCLUDE_LIBRARY, {
       execute: async (arg) => {
         if (LibraryPackage.is(arg)) {
@@ -174,7 +168,7 @@ export class IncludeLibrary extends SketchContribution {
 
   protected async includeLibrary(library: LibraryPackage): Promise<void> {
     const sketch = await this.sketchServiceClient.currentSketch();
-    if (!CurrentSketch.isValid(sketch)) {
+    if (!sketch) {
       return;
     }
     // If the current editor is one of the additional files from the sketch, we use that.

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,212 +0,0 @@
-import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { Mutex } from 'async-mutex';
-import {
-  ArduinoDaemon,
-  assertSanitizedFqbn,
-  BoardsService,
-  ExecutableService,
-  sanitizeFqbn,
-} from '../../common/protocol';
-import { CurrentSketch } from '../sketches-service-client-impl';
-import { BoardsConfig } from '../boards/boards-config';
-import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import { HostedPluginEvents } from '../hosted-plugin-events';
-import { NotificationCenter } from '../notification-center';
-import { SketchContribution, URI } from './contribution';
-import { BoardsDataStore } from '../boards/boards-data-store';
-
-@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;
-
-  private readonly toDispose = new DisposableCollection();
-  private readonly languageServerStartMutex = new Mutex();
-  private languageServerFqbn?: string;
-
-  override onReady(): void {
-    const start = (
-      { selectedBoard }: BoardsConfig.Config,
-      forceStart = false
-    ) => {
-      if (selectedBoard) {
-        const { name, fqbn } = selectedBoard;
-        if (fqbn) {
-          this.startLanguageServer(fqbn, name, forceStart);
-        }
-      }
-    };
-    const forceRestart = () => {
-      start(this.boardsServiceProvider.boardsConfig, true);
-    };
-    this.toDispose.pushAll([
-      this.boardsServiceProvider.onBoardsConfigChanged(start),
-      this.hostedPluginEvents.onPluginsDidStart(() =>
-        start(this.boardsServiceProvider.boardsConfig)
-      ),
-      this.hostedPluginEvents.onPluginsWillUnload(
-        () => (this.languageServerFqbn = undefined)
-      ),
-      this.preferences.onPreferenceChanged(
-        ({ preferenceName, oldValue, newValue }) => {
-          if (oldValue !== newValue) {
-            switch (preferenceName) {
-              case 'arduino.language.log':
-              case 'arduino.language.realTimeDiagnostics':
-                forceRestart();
-            }
-          }
-        }
-      ),
-      this.notificationCenter.onLibraryDidInstall(() => forceRestart()),
-      this.notificationCenter.onLibraryDidUninstall(() => forceRestart()),
-      this.notificationCenter.onPlatformDidInstall(() => forceRestart()),
-      this.notificationCenter.onPlatformDidUninstall(() => forceRestart()),
-      this.notificationCenter.onDidReinitialize(() => forceRestart()),
-      this.boardDataStore.onChanged((dataChangePerFqbn) => {
-        if (this.languageServerFqbn) {
-          const sanitizedFqbn = sanitizeFqbn(this.languageServerFqbn);
-          if (!sanitizeFqbn) {
-            throw new Error(
-              `Failed to sanitize the FQBN of the running language server. FQBN with the board settings was: ${this.languageServerFqbn}`
-            );
-          }
-          const matchingFqbn = dataChangePerFqbn.find(
-            (fqbn) => sanitizedFqbn === fqbn
-          );
-          const { boardsConfig } = this.boardsServiceProvider;
-          if (
-            matchingFqbn &&
-            boardsConfig.selectedBoard?.fqbn === matchingFqbn
-          ) {
-            start(boardsConfig);
-          }
-        }
-      }),
-    ]);
-    start(this.boardsServiceProvider.boardsConfig);
-  }
-
-  onStop(): void {
-    this.toDispose.dispose();
-  }
-
-  private async startLanguageServer(
-    fqbn: string,
-    name: string | undefined,
-    forceStart = false
-  ): Promise<void> {
-    const port = await this.daemon.tryGetPort();
-    if (!port) {
-      return;
-    }
-    const release = await this.languageServerStartMutex.acquire();
-    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;
-      }
-      assertSanitizedFqbn(fqbn);
-      const fqbnWithConfig = await this.boardDataStore.appendConfigToFqbn(fqbn);
-      if (!fqbnWithConfig) {
-        throw new Error(
-          `Failed to append boards config to the FQBN. Original FQBN was: ${fqbn}`
-        );
-      }
-      if (!forceStart && fqbnWithConfig === this.languageServerFqbn) {
-        // NOOP
-        return;
-      }
-      this.logger.info(`Starting language server: ${fqbnWithConfig}`);
-      const log = this.preferences.get('arduino.language.log');
-      const realTimeDiagnostics = this.preferences.get(
-        'arduino.language.realTimeDiagnostics'
-      );
-      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) =>
-          setTimeout(
-            () => reject(new Error(`Timeout after ${20_000} ms.`)),
-            20_000
-          )
-        ),
-        this.commandService.executeCommand<string>(
-          'arduino.languageserver.start',
-          {
-            lsPath,
-            cliDaemonAddr: `localhost:${port}`,
-            clangdPath,
-            log: currentSketchPath ? currentSketchPath : log,
-            cliDaemonInstance: '1',
-            board: {
-              fqbn: fqbnWithConfig,
-              name: name ? `"${name}"` : undefined,
-            },
-            realTimeDiagnostics,
-            silentOutput: true,
-          }
-        ),
-      ]);
-    } catch (e) {
-      console.log(`Failed to start language server. Original FQBN: ${fqbn}`, e);
-      this.languageServerFqbn = undefined;
-    } finally {
-      release();
-    }
-  }
-}

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 = require('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,6 +1,7 @@
 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 { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import {
   SketchContribution,
   URI,
@@ -8,34 +9,49 @@ import {
   CommandRegistry,
   MenuModelRegistry,
   KeybindingRegistry,
+  TabBarToolbarRegistry,
 } from './contribution';
 
 @injectable()
 export class NewSketch extends SketchContribution {
-  override registerCommands(registry: CommandRegistry): void {
+  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),
+    });
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
       commandId: NewSketch.Commands.NEW_SKETCH.id,
-      label: nls.localize('arduino/sketch/new', 'New Sketch'),
+      label: nls.localize('arduino/sketch/new', 'New'),
       order: '0',
     });
   }
 
-  override registerKeybindings(registry: KeybindingRegistry): void {
+  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: nls.localize('arduino/sketch/new', 'New'),
+      priority: 3,
+    });
+  }
+
   async newSketch(): Promise<void> {
     try {
-      const sketch = await this.sketchesService.createNewSketch();
+      const sketch = await this.sketchService.createNewSketch();
       this.workspaceService.open(new URI(sketch.uri));
     } catch (e) {
       await this.messageService.error(e.toString());
@@ -48,5 +64,8 @@ export namespace NewSketch {
     export const NEW_SKETCH: Command = {
       id: 'arduino-new-sketch',
     };
+    export const NEW_SKETCH__TOOLBAR: Command = {
+      id: 'arduino-new-sketch--toolbar',
+    };
   }
 }

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

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

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

@@ -1,4 +1,4 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from 'inversify';
 import { WorkspaceServer } from '@theia/workspace/lib/common/workspace-protocol';
 import {
   Disposable,
@@ -15,7 +15,6 @@ import { MainMenuManager } from '../../common/main-menu-manager';
 import { OpenSketch } from './open-sketch';
 import { NotificationCenter } from '../notification-center';
 import { nls } from '@theia/core/lib/common';
-import { SketchesError } from '../../common/protocol';
 
 @injectable()
 export class OpenRecentSketch extends SketchContribution {
@@ -34,25 +33,20 @@ export class OpenRecentSketch extends SketchContribution {
   @inject(NotificationCenter)
   protected readonly notificationCenter: NotificationCenter;
 
-  protected toDispose = new DisposableCollection();
+  protected toDisposeBeforeRegister = new Map<string, DisposableCollection>();
 
-  override onStart(): void {
-    this.notificationCenter.onRecentSketchesDidChange(({ sketches }) =>
-      this.refreshMenu(sketches)
+  onStart(): void {
+    const refreshMenu = (sketches: Sketch[]) => {
+      this.register(sketches);
+      this.mainMenuManager.update();
+    };
+    this.notificationCenter.onRecentSketchesChanged(({ sketches }) =>
+      refreshMenu(sketches)
     );
+    this.sketchService.recentlyOpenedSketches().then(refreshMenu);
   }
 
-  override async onReady(): Promise<void> {
-    this.update();
-  }
-
-  private update(forceUpdate?: boolean): void {
-    this.sketchesService
-      .recentlyOpenedSketches(forceUpdate)
-      .then((sketches) => this.refreshMenu(sketches));
-  }
-
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     registry.registerSubmenu(
       ArduinoMenus.FILE__OPEN_RECENT_SUBMENU,
       nls.localize('arduino/sketch/openRecent', 'Open Recent'),
@@ -60,32 +54,21 @@ export class OpenRecentSketch extends SketchContribution {
     );
   }
 
-  private refreshMenu(sketches: Sketch[]): void {
-    this.register(sketches);
-    this.mainMenuManager.update();
-  }
-
   protected register(sketches: Sketch[]): void {
     const order = 0;
-    this.toDispose.dispose();
     for (const sketch of sketches) {
       const { uri } = sketch;
+      const toDispose = this.toDisposeBeforeRegister.get(uri);
+      if (toDispose) {
+        toDispose.dispose();
+      }
       const command = { id: `arduino-open-recent--${uri}` };
       const handler = {
-        execute: async () => {
-          try {
-            await this.commandRegistry.executeCommand(
-              OpenSketch.Commands.OPEN_SKETCH.id,
-              sketch
-            );
-          } catch (err) {
-            if (SketchesError.NotFound.is(err)) {
-              this.update(true);
-            } else {
-              throw err;
-            }
-          }
-        },
+        execute: () =>
+          this.commandRegistry.executeCommand(
+            OpenSketch.Commands.OPEN_SKETCH.id,
+            sketch
+          ),
       };
       this.commandRegistry.registerCommand(command, handler);
       this.menuRegistry.registerMenuAction(
@@ -96,7 +79,8 @@ export class OpenRecentSketch extends SketchContribution {
           order: String(order),
         }
       );
-      this.toDispose.pushAll([
+      this.toDisposeBeforeRegister.set(
+        sketch.uri,
         new DisposableCollection(
           Disposable.create(() =>
             this.commandRegistry.unregisterCommand(command)
@@ -104,8 +88,8 @@ export class OpenRecentSketch extends SketchContribution {
           Disposable.create(() =>
             this.menuRegistry.unregisterMenuAction(command)
           )
-        ),
-      ]);
+        )
+      );
     }
   }
 }

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

@@ -1,4 +1,4 @@
-import { injectable } from '@theia/core/shared/inversify';
+import { injectable } from 'inversify';
 import * as remote from '@theia/core/electron-shared/@electron/remote';
 import URI from '@theia/core/lib/common/uri';
 import { ArduinoMenus } from '../menu/arduino-menus';
@@ -13,13 +13,13 @@ import { nls } from '@theia/core/lib/common';
 
 @injectable()
 export class OpenSketchExternal extends SketchContribution {
-  override registerCommands(registry: CommandRegistry): void {
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(OpenSketchExternal.Commands.OPEN_EXTERNAL, {
       execute: () => this.openExternal(),
     });
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     registry.registerMenuAction(ArduinoMenus.SKETCH__UTILS_GROUP, {
       commandId: OpenSketchExternal.Commands.OPEN_EXTERNAL.id,
       label: nls.localize('arduino/sketch/showFolder', 'Show Sketch Folder'),
@@ -27,7 +27,7 @@ export class OpenSketchExternal extends SketchContribution {
     });
   }
 
-  override registerKeybindings(registry: KeybindingRegistry): void {
+  registerKeybindings(registry: KeybindingRegistry): void {
     registry.registerKeybinding({
       command: OpenSketchExternal.Commands.OPEN_EXTERNAL.id,
       keybinding: 'CtrlCmd+Alt+K',

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

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

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

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

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

@@ -1,4 +1,4 @@
-import { injectable } from '@theia/core/shared/inversify';
+import { injectable } from 'inversify';
 import * as remote from '@theia/core/electron-shared/@electron/remote';
 import { isOSX } from '@theia/core/lib/common/os';
 import {
@@ -13,7 +13,7 @@ import { nls } from '@theia/core/lib/common';
 
 @injectable()
 export class QuitApp extends Contribution {
-  override registerCommands(registry: CommandRegistry): void {
+  registerCommands(registry: CommandRegistry): void {
     if (!isOSX) {
       registry.registerCommand(QuitApp.Commands.QUIT_APP, {
         execute: () => remote.app.quit(),
@@ -21,7 +21,7 @@ export class QuitApp extends Contribution {
     }
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     // On macOS we will get the `Quit ${YOUR_APP_NAME}` menu item natively, no need to duplicate it.
     if (!isOSX) {
       registry.registerMenuAction(ArduinoMenus.FILE__QUIT_GROUP, {
@@ -32,7 +32,7 @@ export class QuitApp extends Contribution {
     }
   }
 
-  override registerKeybindings(registry: KeybindingRegistry): void {
+  registerKeybindings(registry: KeybindingRegistry): void {
     if (!isOSX) {
       registry.registerKeybinding({
         command: QuitApp.Commands.QUIT_APP.id,

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

@@ -1,166 +0,0 @@
-import { CompositeTreeNode } from '@theia/core/lib/browser/tree';
-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 { isConflict } from '../create/typings';
-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 {
-  CloudSketchContribution,
-  pullingSketch,
-  pushingSketch,
-  sketchAlreadyExists,
-  synchronizingSketchbook,
-} from './cloud-contribution';
-import { Command, CommandRegistry, Sketch, URI } from './contribution';
-
-export interface RenameCloudSketchParams {
-  readonly cloudUri: URI;
-  readonly sketch: Sketch;
-}
-
-@injectable()
-export class RenameCloudSketch extends CloudSketchContribution {
-  override registerCommands(registry: CommandRegistry): void {
-    registry.registerCommand(RenameCloudSketch.Commands.RENAME_CLOUD_SKETCH, {
-      execute: (params: RenameCloudSketchParams) =>
-        this.renameSketch(params, true),
-    });
-  }
-
-  private async renameSketch(
-    params: RenameCloudSketchParams,
-    skipShowErrorMessageOnOpen: boolean,
-    initValue: string = params.sketch.name
-  ): Promise<string | undefined> {
-    const treeModel = await this.treeModel();
-    if (treeModel) {
-      const posixPath = params.cloudUri.path.toString();
-      const node = treeModel.getNode(posixPath);
-      const parentNode = node?.parent;
-      if (
-        CloudSketchbookTree.CloudSketchDirNode.is(node) &&
-        CompositeTreeNode.is(parentNode)
-      ) {
-        return this.openWizard(
-          params,
-          node,
-          parentNode,
-          treeModel,
-          skipShowErrorMessageOnOpen,
-          initValue
-        );
-      }
-    }
-    return undefined;
-  }
-
-  private async openWizard(
-    params: RenameCloudSketchParams,
-    node: CloudSketchbookTree.CloudSketchDirNode,
-    parentNode: CompositeTreeNode,
-    treeModel: CloudSketchbookTreeModel,
-    skipShowErrorMessageOnOpen: boolean,
-    initialValue?: string | undefined
-  ): Promise<string | undefined> {
-    const parentUri = CloudSketchbookTree.CloudSketchDirNode.is(parentNode)
-      ? parentNode.uri
-      : CreateUri.root;
-    const existingNames = parentNode.children
-      .filter(CloudSketchbookTree.CloudSketchDirNode.is)
-      .map(({ fileStat }) => fileStat.name);
-    const taskFactory = new TaskFactoryImpl((value) =>
-      this.renameSketchWithProgress(params, node, treeModel, value)
-    );
-    try {
-      const dialog = new WorkspaceInputDialogWithProgress(
-        {
-          title: nls.localize(
-            'arduino/renameCloudSketch/renameSketchTitle',
-            'New name of the Cloud Sketch'
-          ),
-          parentUri,
-          initialValue,
-          validate: (input) => {
-            if (existingNames.includes(input)) {
-              return sketchAlreadyExists(input);
-            }
-            return Sketch.validateCloudSketchFolderName(input) ?? '';
-          },
-        },
-        this.labelProvider,
-        taskFactory
-      );
-      await dialog.open(skipShowErrorMessageOnOpen);
-      return dialog.taskResult;
-    } catch (err) {
-      if (isConflict(err)) {
-        await treeModel.refresh();
-        return this.renameSketch(
-          params,
-          false,
-          taskFactory.value ?? initialValue
-        );
-      }
-      throw err;
-    }
-  }
-
-  private renameSketchWithProgress(
-    params: RenameCloudSketchParams,
-    node: CloudSketchbookTree.CloudSketchDirNode,
-    treeModel: CloudSketchbookTreeModel,
-    value: string
-  ): (progress: Progress) => Promise<string | undefined> {
-    return async (progress: Progress) => {
-      const fromName = params.cloudUri.path.name;
-      const fromPosixPath = params.cloudUri.path.toString();
-      const toPosixPath = params.cloudUri.parent.resolve(value).path.toString();
-      // push
-      progress.report({ message: pushingSketch(params.sketch.name) });
-      await treeModel.sketchbookTree().push(node, true);
-
-      // rename
-      progress.report({
-        message: nls.localize(
-          'arduino/cloudSketch/renaming',
-          "Renaming cloud sketch from '{0}' to '{1}'...",
-          fromName,
-          value
-        ),
-      });
-      await this.createApi.rename(fromPosixPath, toPosixPath);
-
-      // sync
-      progress.report({
-        message: synchronizingSketchbook,
-      });
-      this.createApi.sketchCache.init(); // invalidate the cache
-      await this.createApi.sketches(); // IDE2 must pull all sketches to find the new one
-      const sketch = this.createApi.sketchCache.getSketch(toPosixPath);
-      if (!sketch) {
-        return undefined;
-      }
-      await treeModel.refresh();
-
-      // pull
-      progress.report({ message: pullingSketch(sketch.name) });
-      const pulledNode = await this.pull(sketch);
-      return pulledNode
-        ? node.uri.parent.resolve(sketch.name).toString()
-        : undefined;
-    };
-  }
-}
-export namespace RenameCloudSketch {
-  export namespace Commands {
-    export const RENAME_CLOUD_SKETCH: Command = {
-      id: 'arduino-rename-cloud-sketch',
-    };
-  }
-}

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

@@ -1,53 +1,47 @@
+import { inject, injectable } from 'inversify';
 import * as remote from '@theia/core/electron-shared/@electron/remote';
-import { Dialog } from '@theia/core/lib/browser/dialogs';
-import { NavigatableWidget } from '@theia/core/lib/browser/navigatable';
-import { Saveable } from '@theia/core/lib/browser/saveable';
-import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
-import { WindowService } from '@theia/core/lib/browser/window/window-service';
-import { nls } from '@theia/core/lib/common/nls';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
-import { WorkspaceInput } from '@theia/workspace/lib/browser/workspace-service';
-import { StartupTask } from '../../electron-common/startup-task';
+import * as dateFormat from 'dateformat';
 import { ArduinoMenus } from '../menu/arduino-menus';
-import { CurrentSketch } from '../sketches-service-client-impl';
-import { CloudSketchContribution } from './cloud-contribution';
 import {
+  SketchContribution,
+  URI,
   Command,
   CommandRegistry,
-  KeybindingRegistry,
   MenuModelRegistry,
-  Sketch,
-  URI,
+  KeybindingRegistry,
 } from './contribution';
-import { DeleteSketch } from './delete-sketch';
-import {
-  RenameCloudSketch,
-  RenameCloudSketchParams,
-} from './rename-cloud-sketch';
+import { nls } from '@theia/core/lib/common';
+import { ApplicationShell, NavigatableWidget, Saveable } from '@theia/core/lib/browser';
+import { EditorManager } from '@theia/editor/lib/browser';
+import { WindowService } from '@theia/core/lib/browser/window/window-service';
 
 @injectable()
-export class SaveAsSketch extends CloudSketchContribution {
-  @inject(ApplicationShell)
-  private readonly shell: ApplicationShell;
-  @inject(WindowService)
-  private readonly windowService: WindowService;
+export class SaveAsSketch extends SketchContribution {
 
-  override registerCommands(registry: CommandRegistry): void {
+  @inject(ApplicationShell)
+  protected readonly applicationShell: ApplicationShell;
+
+  @inject(EditorManager)
+  protected readonly editorManager: EditorManager;
+
+  @inject(WindowService)
+  protected readonly windowService: WindowService;
+
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(SaveAsSketch.Commands.SAVE_AS_SKETCH, {
       execute: (args) => this.saveAs(args),
     });
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
       commandId: SaveAsSketch.Commands.SAVE_AS_SKETCH.id,
-      label: nls.localizeByDefault('Save As...'),
+      label: nls.localize('vscode/fileCommands/saveAs', 'Save As...'),
       order: '7',
     });
   }
 
-  override registerKeybindings(registry: KeybindingRegistry): void {
+  registerKeybindings(registry: KeybindingRegistry): void {
     registry.registerKeybinding({
       command: SaveAsSketch.Commands.SAVE_AS_SKETCH.id,
       keybinding: 'CtrlCmd+Shift+S',
@@ -57,199 +51,115 @@ export class SaveAsSketch extends CloudSketchContribution {
   /**
    * Resolves `true` if the sketch was successfully saved as something.
    */
-  private async saveAs(
+  async saveAs(
     {
       execOnlyIfTemp,
       openAfterMove,
       wipeOriginal,
-      markAsRecentlyOpened,
     }: SaveAsSketch.Options = SaveAsSketch.Options.DEFAULT
   ): Promise<boolean> {
     const sketch = await this.sketchServiceClient.currentSketch();
-    if (!CurrentSketch.isValid(sketch)) {
+    if (!sketch) {
       return false;
     }
 
-    let destinationUri: string | undefined;
-    const cloudUri = this.createFeatures.cloudUri(sketch);
-    if (cloudUri) {
-      destinationUri = await this.createCloudCopy({ cloudUri, sketch });
-    } else {
-      destinationUri = await this.createLocalCopy(sketch, execOnlyIfTemp);
-    }
-    if (!destinationUri) {
-      return false;
-    }
-
-    const copiedSketch = await this.sketchesService.copy(sketch, {
-      destinationUri,
-    });
-    const newWorkspaceUri = copiedSketch.uri;
-
-    await saveOntoCopiedSketch(
-      sketch,
-      newWorkspaceUri,
-      this.shell,
-      this.editorManager
-    );
-    if (markAsRecentlyOpened) {
-      this.sketchesService.markAsRecentlyOpened(newWorkspaceUri);
-    }
-    const options: WorkspaceInput & StartupTask.Owner = {
-      preserveWindow: true,
-      tasks: [],
-    };
-    if (openAfterMove) {
-      this.windowService.setSafeToShutDown();
-      if (wipeOriginal || (openAfterMove && execOnlyIfTemp)) {
-        options.tasks.push({
-          command: DeleteSketch.Commands.DELETE_SKETCH.id,
-          args: [{ toDelete: sketch.uri }],
-        });
-      }
-      this.workspaceService.open(new URI(newWorkspaceUri), options);
-    }
-    return !!newWorkspaceUri;
-  }
-
-  private async createCloudCopy(
-    params: RenameCloudSketchParams
-  ): Promise<string | undefined> {
-    return this.commandService.executeCommand<string>(
-      RenameCloudSketch.Commands.RENAME_CLOUD_SKETCH.id,
-      params
-    );
-  }
-
-  private async createLocalCopy(
-    sketch: Sketch,
-    execOnlyIfTemp?: boolean
-  ): Promise<string | undefined> {
-    const isTemp = await this.sketchesService.isTemp(sketch);
+    const isTemp = await this.sketchService.isTemp(sketch);
     if (!isTemp && !!execOnlyIfTemp) {
-      return undefined;
+      return false;
     }
 
-    const sketchUri = new URI(sketch.uri);
-    const sketchbookDirUri = await this.defaultUri();
-    // If the sketch is temp, IDE2 proposes the default sketchbook folder URI.
-    // If the sketch is not temp, but not contained in the default sketchbook folder, IDE2 proposes the default location.
-    // Otherwise, it proposes the parent folder of the current sketch.
-    const containerDirUri = isTemp
-      ? sketchbookDirUri
-      : !sketchbookDirUri.isEqualOrParent(sketchUri)
-      ? sketchbookDirUri
-      : sketchUri.parent;
-    const exists = await this.fileService.exists(
-      containerDirUri.resolve(sketch.name)
-    );
-
     // If target does not exist, propose a `directories.user`/${sketch.name} path
     // If target exists, propose `directories.user`/${sketch.name}_copy_${yyyymmddHHMMss}
-    // IDE2 must never prompt an invalid sketch folder name (https://github.com/arduino/arduino-ide/pull/1833#issuecomment-1412569252)
-    const defaultUri = containerDirUri.resolve(
-      Sketch.toValidSketchFolderName(sketch.name, exists)
+    const sketchDirUri = new URI(
+      (await this.configService.getConfiguration()).sketchDirUri
     );
+    const exists = await this.fileService.exists(
+      sketchDirUri.resolve(sketch.name)
+    );
+    const defaultUri = exists
+      ? sketchDirUri.resolve(
+          sketchDirUri
+            .resolve(
+              `${sketch.name}_copy_${dateFormat(new Date(), 'yyyymmddHHMMss')}`
+            )
+            .toString()
+        )
+      : sketchDirUri.resolve(sketch.name);
     const defaultPath = await this.fileService.fsPath(defaultUri);
-    return await this.promptLocalSketchFolderDestination(sketch, defaultPath);
+    const { filePath, canceled } = await remote.dialog.showSaveDialog({
+      title: nls.localize(
+        'arduino/sketch/saveFolderAs',
+        'Save sketch folder as...'
+      ),
+      defaultPath,
+    });
+    if (!filePath || canceled) {
+      return false;
+    }
+    const destinationUri = await this.fileSystemExt.getUri(filePath);
+    if (!destinationUri) {
+      return false;
+    }
+    const workspaceUri = await this.sketchService.copy(sketch, {
+      destinationUri,
+    });
+    if (workspaceUri) {
+      await this.saveOntoCopiedSketch(sketch.mainFileUri, sketch.uri, workspaceUri);
+    }
+    if (workspaceUri && openAfterMove) {
+      if (wipeOriginal || (openAfterMove && execOnlyIfTemp)) {
+        try {
+          await this.fileService.delete(new URI(sketch.uri), {
+            recursive: true,
+          });
+        } catch {
+          /* NOOP: from time to time, it's not possible to wipe the old resource from the temp dir on Windows */
+        }
+      }
+      this.windowService.setSafeToShutDown();
+      this.workspaceService.open(new URI(workspaceUri), {
+        preserveWindow: true,
+      });
+    }
+    return !!workspaceUri;
   }
 
-  /**
-   * Prompts for the new sketch folder name until a valid one is give,
-   * then resolves with the destination sketch folder URI string,
-   * or `undefined` if the operation was canceled.
-   */
-  private async promptLocalSketchFolderDestination(
-    sketch: Sketch,
-    defaultPath: string
-  ): Promise<string | undefined> {
-    let sketchFolderDestinationUri: string | undefined;
-    while (!sketchFolderDestinationUri) {
-      const { filePath } = await remote.dialog.showSaveDialog(
-        remote.getCurrentWindow(),
-        {
-          title: nls.localize(
-            'arduino/sketch/saveFolderAs',
-            'Save sketch folder as...'
-          ),
-          defaultPath,
+  private async saveOntoCopiedSketch(mainFileUri: string, sketchUri: string, newSketchUri: string): Promise<void> {
+    const widgets = this.applicationShell.widgets;
+    const snapshots = new Map<string, object>();
+    for (const widget of widgets) {
+      const saveable = Saveable.getDirty(widget);
+      const uri = NavigatableWidget.getUri(widget);
+      const uriString = uri?.toString();
+      let relativePath: string;
+      if (uri && uriString!.includes(sketchUri) && saveable && saveable.createSnapshot) {
+        // The main file will change its name during the copy process
+        // We need to store the new name in the map
+        if (mainFileUri === uriString) {
+          const lastPart = new URI(newSketchUri).path.base + uri.path.ext;
+          relativePath = '/' + lastPart;
+        } else {
+          relativePath = uri.toString().substring(sketchUri.length);
         }
-      );
-      if (!filePath) {
-        return undefined;
-      }
-      const destinationUri = await this.fileSystemExt.getUri(filePath);
-      // The new location of the sketch cannot be inside the location of current sketch.
-      // https://github.com/arduino/arduino-ide/issues/1882
-      let dialogContent: InvalidSketchFolderDialogContent | undefined;
-      if (new URI(sketch.uri).isEqualOrParent(new URI(destinationUri))) {
-        dialogContent = {
-          message: nls.localize(
-            'arduino/sketch/invalidSketchFolderLocationMessage',
-            "Invalid sketch folder location: '{0}'",
-            filePath
-          ),
-          details: nls.localize(
-            'arduino/sketch/invalidSketchFolderLocationDetails',
-            'You cannot save a sketch into a folder inside itself.'
-          ),
-          question: nls.localize(
-            'arduino/sketch/editInvalidSketchFolderLocationQuestion',
-            'Do you want to try saving the sketch to a different location?'
-          ),
-        };
-      }
-      if (!dialogContent) {
-        const sketchFolderName = new URI(destinationUri).path.base;
-        const errorMessage = Sketch.validateSketchFolderName(sketchFolderName);
-        if (errorMessage) {
-          dialogContent = {
-            message: nls.localize(
-              'arduino/sketch/invalidSketchFolderNameMessage',
-              "Invalid sketch folder name: '{0}'",
-              sketchFolderName
-            ),
-            details: errorMessage,
-            question: nls.localize(
-              'arduino/sketch/editInvalidSketchFolderQuestion',
-              'Do you want to try saving the sketch with a different name?'
-            ),
-          };
-        }
-      }
-      if (dialogContent) {
-        const message = `
-${dialogContent.message}
-
-${dialogContent.details}
-
-${dialogContent.question}`.trim();
-        defaultPath = filePath;
-        const { response } = await remote.dialog.showMessageBox(
-          remote.getCurrentWindow(),
-          {
-            message,
-            buttons: [Dialog.CANCEL, Dialog.YES],
-          }
-        );
-        // cancel
-        if (response === 0) {
-          return undefined;
-        }
-      } else {
-        sketchFolderDestinationUri = destinationUri;
+        snapshots.set(relativePath, saveable.createSnapshot());
       }
     }
-    return sketchFolderDestinationUri;
+    await Promise.all(Array.from(snapshots.entries()).map(async ([path, snapshot]) => {
+      const widgetUri = new URI(newSketchUri + path);
+      try {
+        const widget = await this.editorManager.getOrCreateByUri(widgetUri);
+        const saveable = Saveable.get(widget);
+        if (saveable && saveable.applySnapshot) {
+          saveable.applySnapshot(snapshot);
+          await saveable.save();
+        }
+      } catch (e) {
+        console.error(e);
+      }
+    }));
   }
 }
 
-interface InvalidSketchFolderDialogContent {
-  readonly message: string;
-  readonly details: string;
-  readonly question: string;
-}
-
 export namespace SaveAsSketch {
   export namespace Commands {
     export const SAVE_AS_SKETCH: Command = {
@@ -263,59 +173,12 @@ export namespace SaveAsSketch {
      * Ignored if `openAfterMove` is `false`.
      */
     readonly wipeOriginal?: boolean;
-    readonly markAsRecentlyOpened?: boolean;
   }
   export namespace Options {
     export const DEFAULT: Options = {
       execOnlyIfTemp: false,
       openAfterMove: true,
       wipeOriginal: false,
-      markAsRecentlyOpened: false,
     };
   }
 }
-
-export async function saveOntoCopiedSketch(
-  sketch: Sketch,
-  newSketchFolderUri: string,
-  shell: ApplicationShell,
-  editorManager: EditorManager
-): Promise<void> {
-  const widgets = shell.widgets;
-  const snapshots = new Map<string, Saveable.Snapshot>();
-  for (const widget of widgets) {
-    const saveable = Saveable.getDirty(widget);
-    const uri = NavigatableWidget.getUri(widget);
-    if (!uri) {
-      continue;
-    }
-    const uriString = uri.toString();
-    let relativePath: string;
-    if (uriString.includes(sketch.uri) && saveable && saveable.createSnapshot) {
-      // The main file will change its name during the copy process
-      // We need to store the new name in the map
-      if (sketch.mainFileUri === uriString) {
-        const lastPart = new URI(newSketchFolderUri).path.base + uri.path.ext;
-        relativePath = '/' + lastPart;
-      } else {
-        relativePath = uri.toString().substring(sketch.uri.length);
-      }
-      snapshots.set(relativePath, saveable.createSnapshot());
-    }
-  }
-  await Promise.all(
-    Array.from(snapshots.entries()).map(async ([path, snapshot]) => {
-      const widgetUri = new URI(newSketchFolderUri + path);
-      try {
-        const widget = await editorManager.getOrCreateByUri(widgetUri);
-        const saveable = Saveable.get(widget);
-        if (saveable && saveable.applySnapshot) {
-          saveable.applySnapshot(snapshot);
-          await saveable.save();
-        }
-      } catch (e) {
-        console.error(e);
-      }
-    })
-  );
-}

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

@@ -1,6 +1,7 @@
-import { injectable } from '@theia/core/shared/inversify';
+import { injectable } from 'inversify';
 import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
+import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import { SaveAsSketch } from './save-as-sketch';
 import {
   SketchContribution,
@@ -8,39 +9,54 @@ import {
   CommandRegistry,
   MenuModelRegistry,
   KeybindingRegistry,
+  TabBarToolbarRegistry,
 } from './contribution';
 import { nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../sketches-service-client-impl';
 
 @injectable()
 export class SaveSketch extends SketchContribution {
-  override registerCommands(registry: CommandRegistry): void {
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(SaveSketch.Commands.SAVE_SKETCH, {
       execute: () => this.saveSketch(),
     });
-  }
-
-  override registerMenus(registry: MenuModelRegistry): void {
-    registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
-      commandId: SaveSketch.Commands.SAVE_SKETCH.id,
-      label: nls.localize('vscode/fileCommands/save', 'Save'),
-      order: '7',
+    registry.registerCommand(SaveSketch.Commands.SAVE_SKETCH__TOOLBAR, {
+      isVisible: (widget) =>
+        ArduinoToolbar.is(widget) && widget.side === 'left',
+      execute: () =>
+        registry.executeCommand(SaveSketch.Commands.SAVE_SKETCH.id),
     });
   }
 
-  override registerKeybindings(registry: KeybindingRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
+    registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
+      commandId: SaveSketch.Commands.SAVE_SKETCH.id,
+      label: nls.localize('vscode/fileCommands/save', 'Save'),
+      order: '6',
+    });
+  }
+
+  registerKeybindings(registry: KeybindingRegistry): void {
     registry.registerKeybinding({
       command: SaveSketch.Commands.SAVE_SKETCH.id,
       keybinding: 'CtrlCmd+S',
     });
   }
 
+  registerToolbarItems(registry: TabBarToolbarRegistry): void {
+    registry.registerItem({
+      id: SaveSketch.Commands.SAVE_SKETCH__TOOLBAR.id,
+      command: SaveSketch.Commands.SAVE_SKETCH__TOOLBAR.id,
+      tooltip: nls.localize('vscode/fileCommands/save', 'Save'),
+      priority: 5,
+    });
+  }
+
   async saveSketch(): Promise<void> {
     const sketch = await this.sketchServiceClient.currentSketch();
-    if (!CurrentSketch.isValid(sketch)) {
+    if (!sketch) {
       return;
     }
-    const isTemp = await this.sketchesService.isTemp(sketch);
+    const isTemp = await this.sketchService.isTemp(sketch);
     if (isTemp) {
       return this.commandService.executeCommand(
         SaveAsSketch.Commands.SAVE_AS_SKETCH.id,
@@ -61,5 +77,8 @@ export namespace SaveSketch {
     export const SAVE_SKETCH: Command = {
       id: 'arduino-save-sketch',
     };
+    export const SAVE_SKETCH__TOOLBAR: Command = {
+      id: 'arduino-save-sketch--toolbar',
+    };
   }
 }

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

@@ -1,54 +0,0 @@
-import {
-  StatusBar,
-  StatusBarAlignment,
-} from '@theia/core/lib/browser/status-bar/status-bar';
-import { nls } from '@theia/core/lib/common/nls';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { BoardsConfig } from '../boards/boards-config';
-import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import { Contribution } from './contribution';
-
-@injectable()
-export class SelectedBoard extends Contribution {
-  @inject(StatusBar)
-  private readonly statusBar: StatusBar;
-
-  @inject(BoardsServiceProvider)
-  private readonly boardsServiceProvider: BoardsServiceProvider;
-
-  override onStart(): void {
-    this.boardsServiceProvider.onBoardsConfigChanged((config) =>
-      this.update(config)
-    );
-  }
-
-  override onReady(): void {
-    this.update(this.boardsServiceProvider.boardsConfig);
-  }
-
-  private update({ selectedBoard, selectedPort }: BoardsConfig.Config): void {
-    this.statusBar.setElement('arduino-selected-board', {
-      alignment: StatusBarAlignment.RIGHT,
-      text: selectedBoard
-        ? `$(microchip) ${selectedBoard.name}`
-        : `$(close) ${nls.localize(
-            'arduino/common/noBoardSelected',
-            'No board selected'
-          )}`,
-      className: 'arduino-selected-board',
-    });
-    if (selectedBoard) {
-      this.statusBar.setElement('arduino-selected-port', {
-        alignment: StatusBarAlignment.RIGHT,
-        text: selectedPort
-          ? nls.localize(
-              'arduino/common/selectedOn',
-              'on {0}',
-              selectedPort.address
-            )
-          : nls.localize('arduino/common/notConnected', '[not connected]'),
-        className: 'arduino-selected-port',
-      });
-    }
-  }
-}

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

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

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

@@ -1,39 +1,52 @@
+import { inject, injectable } from 'inversify';
 import { CommonCommands } from '@theia/core/lib/browser/common-frontend-contribution';
-import { ContextMenuRenderer } from '@theia/core/lib/browser/context-menu-renderer';
 import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell';
+import { WorkspaceCommands } from '@theia/workspace/lib/browser';
+import { ContextMenuRenderer } from '@theia/core/lib/browser/context-menu-renderer';
 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 { WorkspaceCommands } from '@theia/workspace/lib/browser/workspace-commands';
-import { ArduinoMenus } from '../menu/arduino-menus';
-import { CurrentSketch } from '../sketches-service-client-impl';
 import {
+  URI,
+  SketchContribution,
   Command,
   CommandRegistry,
-  KeybindingRegistry,
   MenuModelRegistry,
-  open,
-  SketchContribution,
+  KeybindingRegistry,
   TabBarToolbarRegistry,
-  URI,
+  open,
 } from './contribution';
+import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
+import { EditorManager } from '@theia/editor/lib/browser/editor-manager';
+import { SketchesServiceClientImpl } from '../../common/protocol/sketches-service-client-impl';
+import { LocalCacheFsProvider } from '../local-cache/local-cache-fs-provider';
+import { nls } from '@theia/core/lib/common';
 
 @injectable()
 export class SketchControl extends SketchContribution {
   @inject(ApplicationShell)
-  private readonly shell: ApplicationShell;
+  protected readonly shell: ApplicationShell;
+
   @inject(MenuModelRegistry)
-  private readonly menuRegistry: MenuModelRegistry;
+  protected readonly menuRegistry: MenuModelRegistry;
+
   @inject(ContextMenuRenderer)
-  private readonly contextMenuRenderer: ContextMenuRenderer;
+  protected readonly contextMenuRenderer: ContextMenuRenderer;
+
+  @inject(EditorManager)
+  protected readonly editorManager: EditorManager;
+
+  @inject(SketchesServiceClientImpl)
+  protected readonly sketchesServiceClient: SketchesServiceClientImpl;
+
+  @inject(LocalCacheFsProvider)
+  protected readonly localCacheFsProvider: LocalCacheFsProvider;
 
   protected readonly toDisposeBeforeCreateNewContextMenu =
     new DisposableCollection();
 
-  override registerCommands(registry: CommandRegistry): void {
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(
       SketchControl.Commands.OPEN_SKETCH_CONTROL__TOOLBAR,
       {
@@ -41,57 +54,110 @@ export class SketchControl extends SketchContribution {
           this.shell.getWidgets('main').indexOf(widget) !== -1,
         execute: async () => {
           this.toDisposeBeforeCreateNewContextMenu.dispose();
+          const sketch = await this.sketchServiceClient.currentSketch();
+          if (!sketch) {
+            return;
+          }
 
-          let parentElement: HTMLElement | undefined = undefined;
           const target = document.getElementById(
             SketchControl.Commands.OPEN_SKETCH_CONTROL__TOOLBAR.id
           );
-          if (target instanceof HTMLElement) {
-            parentElement = target.parentElement ?? undefined;
+          if (!(target instanceof HTMLElement)) {
+            return;
           }
+          const { parentElement } = target;
           if (!parentElement) {
             return;
           }
 
-          const sketch = await this.sketchServiceClient.currentSketch();
-          if (!CurrentSketch.isValid(sketch)) {
-            return;
+          const { mainFileUri, rootFolderFileUris } =
+            await this.sketchService.loadSketch(sketch.uri);
+          const uris = [mainFileUri, ...rootFolderFileUris];
+
+          const currentSketch =
+            await this.sketchesServiceClient.currentSketch();
+          const parentsketchUri = this.editorManager.currentEditor
+            ?.getResourceUri()
+            ?.toString();
+          const parentsketch = await this.sketchService.getSketchFolder(
+            parentsketchUri || ''
+          );
+
+          // if the current file is in the current opened sketch, show extra menus
+          if (
+            currentSketch &&
+            parentsketch &&
+            parentsketch.uri === currentSketch.uri &&
+            this.allowRename(parentsketch.uri)
+          ) {
+            this.menuRegistry.registerMenuAction(
+              ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
+              {
+                commandId: WorkspaceCommands.FILE_RENAME.id,
+                label: nls.localize('vscode/fileActions/rename', 'Rename'),
+                order: '1',
+              }
+            );
+            this.toDisposeBeforeCreateNewContextMenu.push(
+              Disposable.create(() =>
+                this.menuRegistry.unregisterMenuAction(
+                  WorkspaceCommands.FILE_RENAME
+                )
+              )
+            );
+          } else {
+            const renamePlaceholder = new PlaceholderMenuNode(
+              ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
+              nls.localize('vscode/fileActions/rename', 'Rename')
+            );
+            this.menuRegistry.registerMenuNode(
+              ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
+              renamePlaceholder
+            );
+            this.toDisposeBeforeCreateNewContextMenu.push(
+              Disposable.create(() =>
+                this.menuRegistry.unregisterMenuNode(renamePlaceholder.id)
+              )
+            );
           }
 
-          this.menuRegistry.registerMenuAction(
-            ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
-            {
-              commandId: WorkspaceCommands.FILE_RENAME.id,
-              label: nls.localize('vscode/fileActions/rename', 'Rename'),
-              order: '1',
-            }
-          );
-          this.toDisposeBeforeCreateNewContextMenu.push(
-            Disposable.create(() =>
-              this.menuRegistry.unregisterMenuAction(
-                WorkspaceCommands.FILE_RENAME
+          if (
+            currentSketch &&
+            parentsketch &&
+            parentsketch.uri === currentSketch.uri &&
+            this.allowDelete(parentsketch.uri)
+          ) {
+            this.menuRegistry.registerMenuAction(
+              ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
+              {
+                commandId: WorkspaceCommands.FILE_DELETE.id, // TODO: customize delete. Wipe sketch if deleting main file. Close window.
+                label: nls.localize('vscode/fileActions/delete', 'Delete'),
+                order: '2',
+              }
+            );
+            this.toDisposeBeforeCreateNewContextMenu.push(
+              Disposable.create(() =>
+                this.menuRegistry.unregisterMenuAction(
+                  WorkspaceCommands.FILE_DELETE
+                )
               )
-            )
-          );
-
-          this.menuRegistry.registerMenuAction(
-            ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
-            {
-              commandId: WorkspaceCommands.FILE_DELETE.id,
-              label: nls.localize('vscode/fileActions/delete', 'Delete'),
-              order: '2',
-            }
-          );
-          this.toDisposeBeforeCreateNewContextMenu.push(
-            Disposable.create(() =>
-              this.menuRegistry.unregisterMenuAction(
-                WorkspaceCommands.FILE_DELETE
+            );
+          } else {
+            const deletePlaceholder = new PlaceholderMenuNode(
+              ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
+              nls.localize('vscode/fileActions/delete', 'Delete')
+            );
+            this.menuRegistry.registerMenuNode(
+              ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
+              deletePlaceholder
+            );
+            this.toDisposeBeforeCreateNewContextMenu.push(
+              Disposable.create(() =>
+                this.menuRegistry.unregisterMenuNode(deletePlaceholder.id)
               )
-            )
-          );
+            );
+          }
 
-          const { mainFileUri, rootFolderFileUris } = sketch;
-          const uris = [mainFileUri, ...rootFolderFileUris];
           for (let i = 0; i < uris.length; i++) {
             const uri = new URI(uris[i]);
 
@@ -110,7 +176,7 @@ export class SketchControl extends SketchContribution {
               {
                 commandId: command.id,
                 label: this.labelProvider.getName(uri),
-                order: String(i).padStart(4),
+                order: `${i}`,
               }
             );
             this.toDisposeBeforeCreateNewContextMenu.push(
@@ -127,7 +193,6 @@ export class SketchControl extends SketchContribution {
                 parentElement.getBoundingClientRect().top +
                 parentElement.offsetHeight,
             },
-            showDisabled: true,
           };
           this.contextMenuRenderer.render(options);
         },
@@ -135,7 +200,7 @@ export class SketchControl extends SketchContribution {
     );
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     registry.registerMenuAction(
       ArduinoMenus.SKETCH_CONTROL__CONTEXT__MAIN_GROUP,
       {
@@ -163,14 +228,14 @@ export class SketchControl extends SketchContribution {
     );
   }
 
-  override registerKeybindings(registry: KeybindingRegistry): void {
+  registerKeybindings(registry: KeybindingRegistry): void {
     registry.registerKeybinding({
       command: WorkspaceCommands.NEW_FILE.id,
       keybinding: 'CtrlCmd+Shift+N',
     });
     registry.registerKeybinding({
       command: CommonCommands.PREVIOUS_TAB.id,
-      keybinding: 'CtrlCmd+Alt+Left',
+      keybinding: 'CtrlCmd+Alt+Left', // TODO: check why electron does not show the keybindings in the UI.
     });
     registry.registerKeybinding({
       command: CommonCommands.NEXT_TAB.id,
@@ -178,19 +243,40 @@ export class SketchControl extends SketchContribution {
     });
   }
 
-  override registerToolbarItems(registry: TabBarToolbarRegistry): void {
+  registerToolbarItems(registry: TabBarToolbarRegistry): void {
     registry.registerItem({
       id: SketchControl.Commands.OPEN_SKETCH_CONTROL__TOOLBAR.id,
       command: SketchControl.Commands.OPEN_SKETCH_CONTROL__TOOLBAR.id,
     });
   }
+
+  protected isCloudSketch(uri: string): boolean {
+    try {
+      const cloudCacheLocation = this.localCacheFsProvider.from(new URI(uri));
+
+      if (cloudCacheLocation) {
+        return true;
+      }
+      return false;
+    } catch {
+      return false;
+    }
+  }
+
+  protected allowRename(uri: string): boolean {
+    return !this.isCloudSketch(uri);
+  }
+
+  protected allowDelete(uri: string): boolean {
+    return !this.isCloudSketch(uri);
+  }
 }
 
 export namespace SketchControl {
   export namespace Commands {
     export const OPEN_SKETCH_CONTROL__TOOLBAR: Command = {
       id: 'arduino-open-sketch-control--toolbar',
-      iconClass: 'fa fa-arduino-sketch-tabs-menu',
+      iconClass: 'fa fa-caret-down',
     };
   }
 }

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

@@ -1,65 +0,0 @@
-import { SaveableWidget } from '@theia/core/lib/browser/saveable';
-import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { FileSystemFrontendContribution } from '@theia/filesystem/lib/browser/filesystem-frontend-contribution';
-import { FileChangeType } from '@theia/filesystem/lib/common/files';
-import { CurrentSketch } from '../sketches-service-client-impl';
-import { Sketch, SketchContribution } from './contribution';
-import { OpenSketchFiles } from './open-sketch-files';
-
-@injectable()
-export class SketchFilesTracker extends SketchContribution {
-  @inject(FileSystemFrontendContribution)
-  private readonly fileSystemFrontendContribution: FileSystemFrontendContribution;
-  private readonly toDisposeOnStop = new DisposableCollection();
-
-  override onStart(): void {
-    this.fileSystemFrontendContribution.onDidChangeEditorFile(
-      ({ type, editor }) => {
-        if (type === FileChangeType.DELETED) {
-          const editorWidget = editor;
-          if (SaveableWidget.is(editorWidget)) {
-            editorWidget.closeWithoutSaving();
-          } else {
-            editorWidget.close();
-          }
-        }
-      }
-    );
-  }
-
-  override onReady(): void {
-    this.sketchServiceClient.currentSketch().then(async (sketch) => {
-      if (CurrentSketch.isValid(sketch)) {
-        this.toDisposeOnStop.push(
-          this.fileService.onDidFilesChange(async (event) => {
-            for (const { type, resource } of event.changes) {
-              if (
-                type === FileChangeType.ADDED &&
-                resource.parent.toString() === sketch.uri
-              ) {
-                const reloadedSketch = await this.sketchesService.loadSketch(
-                  sketch.uri
-                );
-                if (Sketch.isInSketch(resource, reloadedSketch)) {
-                  this.commandService.executeCommand(
-                    OpenSketchFiles.Commands.ENSURE_OPENED.id,
-                    resource.toString(),
-                    true,
-                    {
-                      mode: 'open',
-                    }
-                  );
-                }
-              }
-            }
-          })
-        );
-      }
-    });
-  }
-
-  onStop(): void {
-    this.toDisposeOnStop.dispose();
-  }
-}

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

@@ -1,31 +1,42 @@
-import { injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from 'inversify';
 import { CommandHandler } from '@theia/core/lib/common/command';
-import { MenuModelRegistry } from './contribution';
+import { CommandRegistry, MenuModelRegistry } from './contribution';
 import { ArduinoMenus } from '../menu/arduino-menus';
+import { MainMenuManager } from '../../common/main-menu-manager';
+import { NotificationCenter } from '../notification-center';
 import { Examples } from './examples';
-import { SketchContainer, SketchesError } from '../../common/protocol';
+import { SketchContainer } from '../../common/protocol';
 import { OpenSketch } from './open-sketch';
-import { nls } from '@theia/core/lib/common/nls';
+import { nls } from '@theia/core/lib/common';
 
 @injectable()
 export class Sketchbook extends Examples {
-  override onStart(): void {
-    this.sketchServiceClient.onSketchbookDidChange(() => this.update());
-    this.configService.onDidChangeSketchDirUri(() => this.update());
-  }
+  @inject(CommandRegistry)
+  protected readonly commandRegistry: CommandRegistry;
 
-  override async onReady(): Promise<void> {
-    this.update();
-  }
+  @inject(MenuModelRegistry)
+  protected readonly menuRegistry: MenuModelRegistry;
 
-  protected override update(): void {
-    this.sketchesService.getSketches({}).then((container) => {
+  @inject(MainMenuManager)
+  protected readonly mainMenuManager: MainMenuManager;
+
+  @inject(NotificationCenter)
+  protected readonly notificationCenter: NotificationCenter;
+
+  onStart(): void {
+    this.sketchService.getSketches({}).then((container) => {
       this.register(container);
-      this.menuManager.update();
+      this.mainMenuManager.update();
+    });
+    this.sketchServiceClient.onSketchbookDidChange(() => {
+      this.sketchService.getSketches({}).then((container) => {
+        this.register(container);
+        this.mainMenuManager.update();
+      });
     });
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     registry.registerSubmenu(
       ArduinoMenus.FILE__SKETCHBOOK_SUBMENU,
       nls.localize('arduino/sketch/sketchbook', 'Sketchbook'),
@@ -33,7 +44,7 @@ export class Sketchbook extends Examples {
     );
   }
 
-  private register(container: SketchContainer): void {
+  protected register(container: SketchContainer): void {
     this.toDispose.dispose();
     this.registerRecursively(
       [...container.children, ...container.sketches],
@@ -42,22 +53,14 @@ export class Sketchbook extends Examples {
     );
   }
 
-  protected override createHandler(uri: string): CommandHandler {
+  protected createHandler(uri: string): CommandHandler {
     return {
       execute: async () => {
-        try {
-          await this.commandService.executeCommand(
-            OpenSketch.Commands.OPEN_SKETCH.id,
-            uri
-          );
-        } catch (err) {
-          if (SketchesError.NotFound.is(err)) {
-            // Force update the menu items to remove the absent sketch.
-            this.update();
-          } else {
-            throw err;
-          }
-        }
+        const sketch = await this.sketchService.loadSketch(uri);
+        return this.commandService.executeCommand(
+          OpenSketch.Commands.OPEN_SKETCH.id,
+          sketch
+        );
       },
     };
   }

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

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

arduino-ide-extension/src/browser/contributions/survey-notification.ts

@@ -1,78 +0,0 @@
-import { MessageService } from '@theia/core';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { LocalStorageService } from '@theia/core/lib/browser';
-import { nls } from '@theia/core/lib/common';
-import { WindowService } from '@theia/core/lib/browser/window/window-service';
-import { ArduinoPreferences } from '../arduino-preferences';
-import { SurveyNotificationService } from '../../common/protocol/survey-service';
-
-const SURVEY_MESSAGE = nls.localize(
-  'arduino/survey/surveyMessage',
-  'Please help us improve by answering this super short survey. We value our community and would like to get to know our supporters a little better.'
-);
-const DO_NOT_SHOW_AGAIN = nls.localize(
-  'arduino/survey/dismissSurvey',
-  "Don't show again"
-);
-const GO_TO_SURVEY = nls.localize(
-  'arduino/survey/answerSurvey',
-  'Answer survey'
-);
-
-const SURVEY_BASE_URL = 'https://surveys.hotjar.com/';
-const surveyId = '17887b40-e1f0-4bd6-b9f0-a37f229ccd8b';
-
-@injectable()
-export class SurveyNotification implements FrontendApplicationContribution {
-  @inject(MessageService)
-  private readonly messageService: MessageService;
-
-  @inject(LocalStorageService)
-  private readonly localStorageService: LocalStorageService;
-
-  @inject(WindowService)
-  private readonly windowService: WindowService;
-
-  @inject(ArduinoPreferences)
-  private readonly arduinoPreferences: ArduinoPreferences;
-
-  @inject(SurveyNotificationService)
-  private readonly surveyNotificationService: SurveyNotificationService;
-
-  onStart(): void {
-    this.arduinoPreferences.ready.then(async () => {
-      if (
-        (await this.surveyNotificationService.isFirstInstance()) &&
-        this.arduinoPreferences.get('arduino.survey.notification')
-      ) {
-        const surveyAnswered = await this.localStorageService.getData(
-          this.surveyKey(surveyId)
-        );
-        if (surveyAnswered !== undefined) {
-          return;
-        }
-        const answer = await this.messageService.info(
-          SURVEY_MESSAGE,
-          DO_NOT_SHOW_AGAIN,
-          GO_TO_SURVEY
-        );
-        switch (answer) {
-          case GO_TO_SURVEY:
-            this.windowService.openNewWindow(SURVEY_BASE_URL + surveyId, {
-              external: true,
-            });
-            this.localStorageService.setData(this.surveyKey(surveyId), true);
-            break;
-          case DO_NOT_SHOW_AGAIN:
-            this.localStorageService.setData(this.surveyKey(surveyId), false);
-            break;
-        }
-      }
-    });
-  }
-
-  private surveyKey(id: string): string {
-    return `answered_survey:${id}`;
-  }
-}

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

@@ -1,193 +0,0 @@
-import { LocalStorageService } from '@theia/core/lib/browser/storage-service';
-import { nls } from '@theia/core/lib/common/nls';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { CoreService, IndexType } from '../../common/protocol';
-import { NotificationCenter } from '../notification-center';
-import { WindowServiceExt } from '../theia/core/window-service-ext';
-import { Command, CommandRegistry, Contribution } from './contribution';
-
-@injectable()
-export class UpdateIndexes extends Contribution {
-  @inject(WindowServiceExt)
-  private readonly windowService: WindowServiceExt;
-  @inject(LocalStorageService)
-  private readonly localStorage: LocalStorageService;
-  @inject(CoreService)
-  private readonly coreService: CoreService;
-  @inject(NotificationCenter)
-  private readonly notificationCenter: NotificationCenter;
-
-  protected override init(): void {
-    super.init();
-    this.notificationCenter.onIndexUpdateDidComplete(({ summary }) =>
-      Promise.all(
-        Object.entries(summary).map(([type, updatedAt]) =>
-          this.setLastUpdateDateTime(type as IndexType, updatedAt)
-        )
-      )
-    );
-  }
-
-  override onReady(): void {
-    this.checkForUpdates();
-  }
-
-  override registerCommands(registry: CommandRegistry): void {
-    registry.registerCommand(UpdateIndexes.Commands.UPDATE_INDEXES, {
-      execute: () => this.updateIndexes(IndexType.All, true),
-    });
-    registry.registerCommand(UpdateIndexes.Commands.UPDATE_PLATFORM_INDEX, {
-      execute: () => this.updateIndexes(['platform'], true),
-    });
-    registry.registerCommand(UpdateIndexes.Commands.UPDATE_LIBRARY_INDEX, {
-      execute: () => this.updateIndexes(['library'], true),
-    });
-  }
-
-  private async checkForUpdates(): Promise<void> {
-    const checkForUpdates = this.preferences['arduino.checkForUpdates'];
-    if (!checkForUpdates) {
-      console.debug(
-        '[update-indexes]: `arduino.checkForUpdates` is `false`. Skipping updating the indexes.'
-      );
-      return;
-    }
-
-    if (await this.windowService.isFirstWindow()) {
-      const summary = await this.coreService.indexUpdateSummaryBeforeInit();
-      if (summary.message) {
-        this.messageService.error(summary.message);
-      }
-      const typesToCheck = IndexType.All.filter((type) => !(type in summary));
-      if (Object.keys(summary).length) {
-        console.debug(
-          `[update-indexes]: Detected an index update summary before the core gRPC client initialization. Updating local storage with ${JSON.stringify(
-            summary
-          )}`
-        );
-      } else {
-        console.debug(
-          '[update-indexes]: No index update summary was available before the core gRPC client initialization. Checking the status of the all the index types.'
-        );
-      }
-      await Promise.allSettled([
-        ...Object.entries(summary).map(([type, updatedAt]) =>
-          this.setLastUpdateDateTime(type as IndexType, updatedAt)
-        ),
-        this.updateIndexes(typesToCheck),
-      ]);
-    }
-  }
-
-  private async updateIndexes(
-    types: IndexType[],
-    force = false
-  ): Promise<void> {
-    const updatedAt = new Date().toISOString();
-    return Promise.all(
-      types.map((type) => this.needsIndexUpdate(type, updatedAt, force))
-    ).then((needsIndexUpdateResults) => {
-      const typesToUpdate = needsIndexUpdateResults.filter(IndexType.is);
-      if (typesToUpdate.length) {
-        console.debug(
-          `[update-indexes]: Requesting the index update of type: ${JSON.stringify(
-            typesToUpdate
-          )} with date time: ${updatedAt}.`
-        );
-        return this.coreService.updateIndex({ types: typesToUpdate });
-      }
-    });
-  }
-
-  private async needsIndexUpdate(
-    type: IndexType,
-    now: string,
-    force = false
-  ): Promise<IndexType | false> {
-    if (force) {
-      console.debug(
-        `[update-indexes]: Update for index type: '${type}' was forcefully requested.`
-      );
-      return type;
-    }
-    const lastUpdateIsoDateTime = await this.getLastUpdateDateTime(type);
-    if (!lastUpdateIsoDateTime) {
-      console.debug(
-        `[update-indexes]: No last update date time was persisted for index type: '${type}'. Index update is required.`
-      );
-      return type;
-    }
-    const lastUpdateDateTime = Date.parse(lastUpdateIsoDateTime);
-    if (Number.isNaN(lastUpdateDateTime)) {
-      console.debug(
-        `[update-indexes]: Invalid last update date time was persisted for index type: '${type}'. Last update date time was: ${lastUpdateDateTime}. Index update is required.`
-      );
-      return type;
-    }
-    const diff = new Date(now).getTime() - lastUpdateDateTime;
-    const needsIndexUpdate = diff >= this.threshold;
-    console.debug(
-      `[update-indexes]: Update for index type '${type}' is ${
-        needsIndexUpdate ? '' : 'not '
-      }required. Now: ${now}, Last index update date time: ${new Date(
-        lastUpdateDateTime
-      ).toISOString()}, diff: ${diff} ms, threshold: ${this.threshold} ms.`
-    );
-    return needsIndexUpdate ? type : false;
-  }
-
-  private async getLastUpdateDateTime(
-    type: IndexType
-  ): Promise<string | undefined> {
-    const key = this.storageKeyOf(type);
-    return this.localStorage.getData<string>(key);
-  }
-
-  private async setLastUpdateDateTime(
-    type: IndexType,
-    updatedAt: string
-  ): Promise<void> {
-    const key = this.storageKeyOf(type);
-    return this.localStorage.setData<string>(key, updatedAt).finally(() => {
-      console.debug(
-        `[update-indexes]: Updated the last index update date time of '${type}' to ${updatedAt}.`
-      );
-    });
-  }
-
-  private storageKeyOf(type: IndexType): string {
-    return `index-last-update-time--${type}`;
-  }
-
-  private get threshold(): number {
-    return 4 * 60 * 60 * 1_000; // four hours in millis
-  }
-}
-export namespace UpdateIndexes {
-  export namespace Commands {
-    export const UPDATE_INDEXES: Command & { label: string } = {
-      id: 'arduino-update-indexes',
-      label: nls.localize(
-        'arduino/updateIndexes/updateIndexes',
-        'Update Indexes'
-      ),
-      category: 'Arduino',
-    };
-    export const UPDATE_PLATFORM_INDEX: Command & { label: string } = {
-      id: 'arduino-update-package-index',
-      label: nls.localize(
-        'arduino/updateIndexes/updatePackageIndex',
-        'Update Package Index'
-      ),
-      category: 'Arduino',
-    };
-    export const UPDATE_LIBRARY_INDEX: Command & { label: string } = {
-      id: 'arduino-update-library-index',
-      label: nls.localize(
-        'arduino/updateIndexes/updateLibraryIndex',
-        'Update Library Index'
-      ),
-      category: 'Arduino',
-    };
-  }
-}

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

@@ -1,4 +1,4 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from 'inversify';
 import {
   Command,
   MenuModelRegistry,
@@ -12,6 +12,7 @@ import {
   PreferenceScope,
   PreferenceService,
 } from '@theia/core/lib/browser/preferences/preference-service';
+import { ArduinoPreferences } from '../arduino-preferences';
 import {
   arduinoCert,
   certificateList,
@@ -30,29 +31,22 @@ export class UploadCertificate extends Contribution {
   @inject(PreferenceService)
   protected readonly preferenceService: PreferenceService;
 
+  @inject(ArduinoPreferences)
+  protected readonly arduinoPreferences: ArduinoPreferences;
+
   @inject(ArduinoFirmwareUploader)
   protected readonly arduinoFirmwareUploader: ArduinoFirmwareUploader;
 
   protected dialogOpened = false;
 
-  override onStart(): void {
-    this.preferences.onPreferenceChanged(({ preferenceName }) => {
-      if (preferenceName === 'arduino.board.certificates') {
-        this.menuManager.update();
-      }
-    });
-  }
-
-  override registerCommands(registry: CommandRegistry): void {
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(UploadCertificate.Commands.OPEN, {
       execute: async () => {
         try {
           this.dialogOpened = true;
-          this.menuManager.update();
           await this.dialog.open();
         } finally {
           this.dialogOpened = false;
-          this.menuManager.update();
         }
       },
       isEnabled: () => !this.dialogOpened,
@@ -60,7 +54,7 @@ export class UploadCertificate extends Contribution {
 
     registry.registerCommand(UploadCertificate.Commands.REMOVE_CERT, {
       execute: async (certToRemove) => {
-        const certs = this.preferences.get('arduino.board.certificates');
+        const certs = this.arduinoPreferences.get('arduino.board.certificates');
 
         this.preferenceService.set(
           'arduino.board.certificates',
@@ -81,6 +75,7 @@ export class UploadCertificate extends Contribution {
             .join(' ')}`
         );
       },
+      isEnabled: () => true,
     });
 
     registry.registerCommand(UploadCertificate.Commands.OPEN_CERT_CONTEXT, {
@@ -94,10 +89,11 @@ export class UploadCertificate extends Contribution {
           args: [args.cert],
         });
       },
+      isEnabled: () => true,
     });
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     registry.registerMenuAction(ArduinoMenus.TOOLS__FIRMWARE_UPLOADER_GROUP, {
       commandId: UploadCertificate.Commands.OPEN.id,
       label: UploadCertificate.Commands.OPEN.label,

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

@@ -1,4 +1,4 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from 'inversify';
 import {
   Command,
   MenuModelRegistry,
@@ -16,23 +16,21 @@ export class UploadFirmware extends Contribution {
 
   protected dialogOpened = false;
 
-  override registerCommands(registry: CommandRegistry): void {
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(UploadFirmware.Commands.OPEN, {
       execute: async () => {
         try {
           this.dialogOpened = true;
-          this.menuManager.update();
           await this.dialog.open();
         } finally {
           this.dialogOpened = false;
-          this.menuManager.update();
         }
       },
       isEnabled: () => !this.dialogOpened,
     });
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
+  registerMenus(registry: MenuModelRegistry): void {
     registry.registerMenuAction(ArduinoMenus.TOOLS__FIRMWARE_UPLOADER_GROUP, {
       commandId: UploadFirmware.Commands.OPEN.id,
       label: UploadFirmware.Commands.OPEN.label,

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

@@ -1,46 +1,117 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
+import { inject, injectable, postConstruct } from 'inversify';
 import { Emitter } from '@theia/core/lib/common/event';
-import { CoreService, Port, sanitizeFqbn } from '../../common/protocol';
-import { ArduinoMenus } from '../menu/arduino-menus';
+import { BoardUserField, CoreService } from '../../common/protocol';
+import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
 import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
+import { BoardsDataStore } from '../boards/boards-data-store';
+import { BoardsServiceProvider } from '../boards/boards-service-provider';
 import {
+  SketchContribution,
   Command,
   CommandRegistry,
   MenuModelRegistry,
   KeybindingRegistry,
   TabBarToolbarRegistry,
-  CoreServiceContribution,
 } from './contribution';
-import { deepClone, nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../sketches-service-client-impl';
-import type { VerifySketchParams } from './verify-sketch';
-import { UserFields } from './user-fields';
+import { UserFieldsDialog } from '../dialogs/user-fields/user-fields-dialog';
+import { DisposableCollection, nls } from '@theia/core/lib/common';
 
 @injectable()
-export class UploadSketch extends CoreServiceContribution {
-  private readonly onDidChangeEmitter = new Emitter<void>();
-  private readonly onDidChange = this.onDidChangeEmitter.event;
-  private uploadInProgress = false;
+export class UploadSketch extends SketchContribution {
+  @inject(CoreService)
+  protected readonly coreService: CoreService;
 
-  @inject(UserFields)
-  private readonly userFields: UserFields;
+  @inject(MenuModelRegistry)
+  protected readonly menuRegistry: MenuModelRegistry;
 
-  override registerCommands(registry: CommandRegistry): void {
+  @inject(BoardsDataStore)
+  protected readonly boardsDataStore: BoardsDataStore;
+
+  @inject(BoardsServiceProvider)
+  protected readonly boardsServiceClientImpl: BoardsServiceProvider;
+
+  @inject(UserFieldsDialog)
+  protected readonly userFieldsDialog: UserFieldsDialog;
+
+  protected cachedUserFields: Map<string, BoardUserField[]> = new Map();
+
+  protected readonly onDidChangeEmitter = new Emitter<Readonly<void>>();
+  readonly onDidChange = this.onDidChangeEmitter.event;
+
+  protected uploadInProgress = false;
+  protected boardRequiresUserFields = false;
+
+  protected readonly menuActionsDisposables = new DisposableCollection();
+
+  @postConstruct()
+  protected init(): void {
+    this.boardsServiceClientImpl.onBoardsConfigChanged(async () => {
+      const userFields =
+        await this.boardsServiceClientImpl.selectedBoardUserFields();
+      this.boardRequiresUserFields = userFields.length > 0;
+      this.registerMenus(this.menuRegistry);
+    });
+  }
+
+  private selectedFqbnAddress(): string {
+    const { boardsConfig } = this.boardsServiceClientImpl;
+    const fqbn = boardsConfig.selectedBoard?.fqbn;
+    if (!fqbn) {
+      return '';
+    }
+    const address =
+      boardsConfig.selectedBoard?.port?.address ||
+      boardsConfig.selectedPort?.address;
+    if (!address) {
+      return '';
+    }
+    return fqbn + '|' + address;
+  }
+
+  registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(UploadSketch.Commands.UPLOAD_SKETCH, {
       execute: async () => {
-        if (await this.userFields.checkUserFieldsDialog()) {
-          this.uploadSketch();
+        const key = this.selectedFqbnAddress();
+        if (!key) {
+          return;
         }
+        if (this.boardRequiresUserFields && !this.cachedUserFields.has(key)) {
+          // Deep clone the array of board fields to avoid editing the cached ones
+          this.userFieldsDialog.value = (
+            await this.boardsServiceClientImpl.selectedBoardUserFields()
+          ).map((f) => ({ ...f }));
+          const result = await this.userFieldsDialog.open();
+          if (!result) {
+            return;
+          }
+          this.cachedUserFields.set(key, result);
+        }
+        this.uploadSketch();
       },
       isEnabled: () => !this.uploadInProgress,
     });
     registry.registerCommand(UploadSketch.Commands.UPLOAD_WITH_CONFIGURATION, {
       execute: async () => {
-        if (await this.userFields.checkUserFieldsDialog(true)) {
-          this.uploadSketch();
+        const key = this.selectedFqbnAddress();
+        if (!key) {
+          return;
         }
+
+        const cached = this.cachedUserFields.get(key);
+        // Deep clone the array of board fields to avoid editing the cached ones
+        this.userFieldsDialog.value = (
+          cached ??
+          (await this.boardsServiceClientImpl.selectedBoardUserFields())
+        ).map((f) => ({ ...f }));
+
+        const result = await this.userFieldsDialog.open();
+        if (!result) {
+          return;
+        }
+        this.cachedUserFields.set(key, result);
+        this.uploadSketch();
       },
-      isEnabled: () => !this.uploadInProgress && this.userFields.isRequired(),
+      isEnabled: () => !this.uploadInProgress && this.boardRequiresUserFields,
     });
     registry.registerCommand(
       UploadSketch.Commands.UPLOAD_SKETCH_USING_PROGRAMMER,
@@ -59,24 +130,50 @@ export class UploadSketch extends CoreServiceContribution {
     });
   }
 
-  override registerMenus(registry: MenuModelRegistry): void {
-    registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
-      commandId: UploadSketch.Commands.UPLOAD_SKETCH.id,
-      label: nls.localize('arduino/sketch/upload', 'Upload'),
-      order: '1',
-    });
+  registerMenus(registry: MenuModelRegistry): void {
+    this.menuActionsDisposables.dispose();
 
-    registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
-      commandId: UploadSketch.Commands.UPLOAD_SKETCH_USING_PROGRAMMER.id,
-      label: nls.localize(
-        'arduino/sketch/uploadUsingProgrammer',
-        'Upload Using Programmer'
-      ),
-      order: '3',
-    });
+    this.menuActionsDisposables.push(
+      registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
+        commandId: UploadSketch.Commands.UPLOAD_SKETCH.id,
+        label: nls.localize('arduino/sketch/upload', 'Upload'),
+        order: '1',
+      })
+    );
+    if (this.boardRequiresUserFields) {
+      this.menuActionsDisposables.push(
+        registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
+          commandId: UploadSketch.Commands.UPLOAD_WITH_CONFIGURATION.id,
+          label: UploadSketch.Commands.UPLOAD_WITH_CONFIGURATION.label,
+          order: '2',
+        })
+      );
+    } else {
+      this.menuActionsDisposables.push(
+        registry.registerMenuNode(
+          ArduinoMenus.SKETCH__MAIN_GROUP,
+          new PlaceholderMenuNode(
+            ArduinoMenus.SKETCH__MAIN_GROUP,
+            // commandId: UploadSketch.Commands.UPLOAD_WITH_CONFIGURATION.id,
+            UploadSketch.Commands.UPLOAD_WITH_CONFIGURATION.label!,
+            { order: '2' }
+          )
+        )
+      );
+    }
+    this.menuActionsDisposables.push(
+      registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
+        commandId: UploadSketch.Commands.UPLOAD_SKETCH_USING_PROGRAMMER.id,
+        label: nls.localize(
+          'arduino/sketch/uploadUsingProgrammer',
+          'Upload Using Programmer'
+        ),
+        order: '3',
+      })
+    );
   }
 
-  override registerKeybindings(registry: KeybindingRegistry): void {
+  registerKeybindings(registry: KeybindingRegistry): void {
     registry.registerKeybinding({
       command: UploadSketch.Commands.UPLOAD_SKETCH.id,
       keybinding: 'CtrlCmd+U',
@@ -87,7 +184,7 @@ export class UploadSketch extends CoreServiceContribution {
     });
   }
 
-  override registerToolbarItems(registry: TabBarToolbarRegistry): void {
+  registerToolbarItems(registry: TabBarToolbarRegistry): void {
     registry.registerItem({
       id: UploadSketch.Commands.UPLOAD_SKETCH_TOOLBAR.id,
       command: UploadSketch.Commands.UPLOAD_SKETCH_TOOLBAR.id,
@@ -98,115 +195,103 @@ export class UploadSketch extends CoreServiceContribution {
   }
 
   async uploadSketch(usingProgrammer = false): Promise<void> {
+    // even with buttons disabled, better to double check if an upload is already in progress
     if (this.uploadInProgress) {
       return;
     }
 
+    // toggle the toolbar button and menu item state.
+    // uploadInProgress will be set to false whether the upload fails or not
+    this.uploadInProgress = true;
+    this.onDidChangeEmitter.fire();
+    const sketch = await this.sketchServiceClient.currentSketch();
+    if (!sketch) {
+      return;
+    }
+
     try {
-      // toggle the toolbar button and menu item state.
-      // uploadInProgress will be set to false whether the upload fails or not
-      this.uploadInProgress = true;
-      this.menuManager.update();
-      this.boardsServiceProvider.snapshotBoardDiscoveryOnUpload();
-      this.onDidChangeEmitter.fire();
-      this.clearVisibleNotification();
+      const { boardsConfig } = this.boardsServiceClientImpl;
+      const [fqbn, { selectedProgrammer }, verify, verbose, sourceOverride] =
+        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.sourceOverride(),
+        ]);
 
-      const verifyOptions =
-        await this.commandService.executeCommand<CoreService.Options.Compile>(
-          'arduino-verify-sketch',
-          <VerifySketchParams>{
-            exportBinaries: false,
-            silent: true,
-          }
+      const board = {
+        ...boardsConfig.selectedBoard,
+        name: boardsConfig.selectedBoard?.name || '',
+        fqbn,
+      }
+      let options: CoreService.Upload.Options | undefined = undefined;
+      const sketchUri = sketch.uri;
+      const optimizeForDebug = this.editorMode.compileForDebug;
+      const { selectedPort } = boardsConfig;
+      const port = selectedPort;
+      const userFields =
+        this.cachedUserFields.get(this.selectedFqbnAddress()) ?? [];
+      if (userFields.length === 0 && this.boardRequiresUserFields) {
+        this.messageService.error(
+          nls.localize(
+            'arduino/sketch/userFieldsNotFoundError',
+            "Can't find user fields for connected board"
+          )
         );
-      if (!verifyOptions) {
         return;
       }
 
-      const uploadOptions = await this.uploadOptions(
-        usingProgrammer,
-        verifyOptions
-      );
-      if (!uploadOptions) {
-        return;
+      if (usingProgrammer) {
+        const programmer = selectedProgrammer;
+        options = {
+          sketchUri,
+          board,
+          optimizeForDebug,
+          programmer,
+          port,
+          verbose,
+          verify,
+          sourceOverride,
+          userFields,
+        };
+      } else {
+        options = {
+          sketchUri,
+          board,
+          optimizeForDebug,
+          port,
+          verbose,
+          verify,
+          sourceOverride,
+          userFields,
+        };
       }
-
-      if (!this.userFields.checkUserFieldsForUpload()) {
-        return;
+      this.outputChannelManager.getChannel('Arduino').clear();
+      if (usingProgrammer) {
+        await this.coreService.uploadUsingProgrammer(options);
+      } else {
+        await this.coreService.upload(options);
       }
-
-      await this.doWithProgress({
-        progressText: nls.localize('arduino/sketch/uploading', 'Uploading...'),
-        task: (progressId, coreService) =>
-          coreService.upload({ ...uploadOptions, progressId }),
-        keepOutput: true,
-      });
-
       this.messageService.info(
         nls.localize('arduino/sketch/doneUploading', 'Done uploading.'),
         { timeout: 3000 }
       );
     } catch (e) {
-      this.userFields.notifyFailedWithError(e);
-      this.handleError(e);
+      let errorMessage = '';
+      if (typeof e === 'string') {
+        errorMessage = e;
+      } else {
+        errorMessage = e.toString();
+      }
+      this.messageService.error(errorMessage);
     } finally {
       this.uploadInProgress = false;
-      this.menuManager.update();
-      this.boardsServiceProvider.attemptPostUploadAutoSelect();
       this.onDidChangeEmitter.fire();
     }
   }
-
-  private async uploadOptions(
-    usingProgrammer: boolean,
-    verifyOptions: CoreService.Options.Compile
-  ): Promise<CoreService.Options.Upload | undefined> {
-    const sketch = await this.sketchServiceClient.currentSketch();
-    if (!CurrentSketch.isValid(sketch)) {
-      return undefined;
-    }
-    const userFields = this.userFields.getUserFields();
-    const { boardsConfig } = this.boardsServiceProvider;
-    const [fqbn, { selectedProgrammer: programmer }, verify, verbose] =
-      await Promise.all([
-        verifyOptions.fqbn, // already decorated FQBN
-        this.boardsDataStore.getData(sanitizeFqbn(verifyOptions.fqbn)),
-        this.preferences.get('arduino.upload.verify'),
-        this.preferences.get('arduino.upload.verbose'),
-      ]);
-    const port = this.maybeUpdatePortProperties(boardsConfig.selectedPort);
-    return {
-      sketch,
-      fqbn,
-      ...(usingProgrammer && { programmer }),
-      port,
-      verbose,
-      verify,
-      userFields,
-    };
-  }
-
-  /**
-   * This is a hack to ensure that the port object has the `properties` when uploading.(https://github.com/arduino/arduino-ide/issues/740)
-   * This method works around a bug when restoring a `port` persisted by an older version of IDE2. See the bug [here](https://github.com/arduino/arduino-ide/pull/1335#issuecomment-1224355236).
-   *
-   * Before the upload, this method checks the available ports and makes sure that the `properties` of an available port, and the port selected by the user have the same `properties`.
-   * This method does not update any state (for example, the `BoardsConfig.Config`) but uses the correct `properties` for the `upload`.
-   */
-  private maybeUpdatePortProperties(port: Port | undefined): Port | undefined {
-    if (port) {
-      const key = Port.keyOf(port);
-      for (const candidate of this.boardsServiceProvider.availablePorts) {
-        if (key === Port.keyOf(candidate) && candidate.properties) {
-          return {
-            ...port,
-            properties: deepClone(candidate.properties),
-          };
-        }
-      }
-    }
-    return port;
-  }
 }
 
 export namespace UploadSketch {
@@ -214,11 +299,11 @@ export namespace UploadSketch {
     export const UPLOAD_SKETCH: Command = {
       id: 'arduino-upload-sketch',
     };
-    export const UPLOAD_WITH_CONFIGURATION: Command & { label: string } = {
+    export const UPLOAD_WITH_CONFIGURATION: Command = {
       id: 'arduino-upload-with-configuration-sketch',
       label: nls.localize(
         'arduino/sketch/configureAndUpload',
-        'Configure and Upload'
+        'Configure And Upload'
       ),
       category: 'Arduino',
     };