another approach

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

.eslintrc.js

@@ -15,6 +15,7 @@ module.exports = {
         '.browser_modules/*',
         'docs/*',
         'scripts/*',
+        'electron/*',
         'electron-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

@@ -9,7 +9,7 @@ contact_links:
     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
+    url: https://github.com/arduino/arduino-ide/blob/main/docs/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

.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

@@ -29,7 +29,7 @@ on:
 
 env:
   # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.17"
   JOB_TRANSFER_ARTIFACT: build-artifacts
   CHANGELOG_ARTIFACTS: changelog
 
@@ -43,7 +43,7 @@ jobs:
             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
@@ -55,21 +55,21 @@ jobs:
 
     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
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -99,7 +99,6 @@ jobs:
             export CSC_LINK="${{ runner.temp }}/signing_certificate.${{ matrix.config.certificate-extension }}"
             echo "${{ secrets[matrix.config.certificate-secret] }}" | base64 --decode > "$CSC_LINK"
             export CSC_KEY_PASSWORD="${{ secrets[matrix.config.certificate-password-secret] }}"
-            export CSC_FOR_PULL_REQUEST=true
           fi
 
           if [ "${{ runner.OS }}" = "Windows" ]; then
@@ -110,7 +109,7 @@ jobs:
           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 +140,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 +158,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 +180,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 +199,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 }}
@@ -225,7 +220,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 }}
@@ -233,10 +228,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,15 +240,6 @@ 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
@@ -277,6 +263,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

@@ -2,7 +2,7 @@ name: Check Internationalization
 
 env:
   # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.17"
 
 # See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
 on:
@@ -27,16 +27,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
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -48,8 +48,6 @@ jobs:
 
       - 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

@@ -2,7 +2,7 @@ name: i18n-nightly-push
 
 env:
   # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.17"
 
 on:
   schedule:
@@ -14,16 +14,16 @@ 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
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
 

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

@@ -2,7 +2,7 @@ name: i18n-weekly-pull
 
 env:
   # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: "1.19"
+  GO_VERSION: "1.17"
 
 on:
   schedule:
@@ -14,16 +14,16 @@ 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
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -45,7 +45,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

@@ -8,8 +8,8 @@ on:
 
 env:
   # See vars.GO_VERSION field of https://github.com/arduino/arduino-cli/blob/master/DistTasks.yml
-  GO_VERSION: "1.19"
-  NODE_VERSION: 16.x
+  GO_VERSION: "1.17"
+  NODE_VERSION: 14.x
 
 jobs:
   pull-from-jsonbin:
@@ -25,7 +25,7 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
 
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v3
         with:
           go-version: ${{ env.GO_VERSION }}
 
@@ -54,7 +54,7 @@ jobs:
         run: yarn run themes:generate
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v4
         with:
           commit-message: Updated themes
           title: Update themes

.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,11 @@ gen-webpack.config.js
 yarn*.log
 # For the VS Code extensions used by Theia.
 plugins
+# the config files for the CLI
+arduino-ide-extension/data/cli/config
 # the tokens folder for the themes
 scripts/themes/tokens
 # environment variables
 .env
 # content trace files for electron
 electron-app/traces
-# any Arduino LS generated log files
-inols*.log

.vscode/launch.json

@@ -14,14 +14,14 @@
         ".",
         "--log-level=debug",
         "--hostname=localhost",
+        "--no-cluster",
         "--app-project-path=${workspaceRoot}/electron-app",
         "--remote-debugging-port=9222",
         "--no-app-auto-install",
         "--plugins=local-dir:../plugins",
         "--hosted-plugin-inspect=9339",
         "--content-trace",
-        "--open-devtools",
-        "--no-ping-timeout",
+        "--open-devtools"
       ],
       "env": {
         "NODE_ENV": "development"
@@ -51,12 +51,12 @@
         ".",
         "--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"

.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

arduino-ide-extension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arduino-ide-extension",
-  "version": "2.1.0",
+  "version": "2.0.0",
   "description": "An extension for Theia building the Arduino IDE",
   "license": "AGPL-3.0-or-later",
   "scripts": {
@@ -17,83 +17,73 @@
     "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",
+    "@theia/application-package": "1.25.0",
+    "@theia/core": "1.25.0",
+    "@theia/editor": "1.25.0",
+    "@theia/electron": "1.25.0",
+    "@theia/filesystem": "1.25.0",
+    "@theia/keymaps": "1.25.0",
+    "@theia/markers": "1.25.0",
+    "@theia/monaco": "1.25.0",
+    "@theia/navigator": "1.25.0",
+    "@theia/outline-view": "1.25.0",
+    "@theia/output": "1.25.0",
+    "@theia/preferences": "1.25.0",
+    "@theia/search-in-workspace": "1.25.0",
+    "@theia/terminal": "1.25.0",
+    "@theia/workspace": "1.25.0",
     "@tippyjs/react": "^4.2.5",
+    "@types/atob": "^2.1.2",
     "@types/auth0-js": "^9.14.0",
     "@types/btoa": "^1.2.3",
     "@types/dateformat": "^3.0.1",
+    "@types/deep-equal": "^1.0.1",
     "@types/deepmerge": "^2.2.0",
     "@types/glob": "^7.2.0",
     "@types/google-protobuf": "^3.7.2",
     "@types/js-yaml": "^3.12.2",
     "@types/keytar": "^4.4.0",
     "@types/lodash.debounce": "^4.0.6",
+    "@types/ncp": "^2.0.4",
     "@types/node-fetch": "^2.5.7",
-    "@types/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.1.0",
     "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",
     "dateformat": "^3.0.3",
+    "deep-equal": "^2.0.5",
     "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",
     "glob": "^7.1.6",
     "google-protobuf": "^3.20.1",
     "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",
@@ -101,6 +91,8 @@
     "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 +101,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 +113,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"
   },
@@ -163,16 +158,16 @@
   ],
   "arduino": {
     "cli": {
-      "version": "0.32.2"
+      "version": "0.27.1"
     },
     "fwuploader": {
-      "version": "2.2.2"
+      "version": "2.2.0"
     },
     "clangd": {
       "version": "14.0.0"
     },
     "languageServer": {
-      "version": "0.7.4"
+      "version": "0.7.1"
     }
   }
 }

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

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

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

@@ -1,7 +1,7 @@
 // @ts-check
 
 // The version to use.
-const version = '1.10.0';
+const version = '1.9.1';
 
 (async () => {
   const os = require('os');

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

@@ -76,12 +76,6 @@
       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');

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

@@ -10,7 +10,10 @@ import {
   MenuContribution,
   MenuModelRegistry,
 } from '@theia/core';
-import { FrontendApplicationContribution } from '@theia/core/lib/browser';
+import {
+  FrontendApplication,
+  FrontendApplicationContribution,
+} from '@theia/core/lib/browser';
 import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
 import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
 import { CommonMenus } from '@theia/core/lib/browser/common-frontend-contribution';
@@ -28,7 +31,7 @@ import { EditorCommands, EditorMainMenu } from '@theia/editor/lib/browser';
 import { MonacoMenus } from '@theia/monaco/lib/browser/monaco-menu';
 import { FileNavigatorCommands } from '@theia/navigator/lib/browser/navigator-contribution';
 import { TerminalMenus } from '@theia/terminal/lib/browser/terminal-frontend-contribution';
-import { ElectronWindowPreferences } from '@theia/core/lib/electron-browser/window/electron-window-preferences';
+import { ArduinoPreferences } from './arduino-preferences';
 import { BoardsServiceProvider } from './boards/boards-service-provider';
 import { BoardsToolBarItem } from './boards/boards-toolbar-item';
 import { ArduinoMenus } from './menu/arduino-menus';
@@ -55,8 +58,8 @@ export class ArduinoFrontendContribution
   @inject(CommandRegistry)
   private readonly commandRegistry: CommandRegistry;
 
-  @inject(ElectronWindowPreferences)
-  private readonly electronWindowPreferences: ElectronWindowPreferences;
+  @inject(ArduinoPreferences)
+  private readonly arduinoPreferences: ArduinoPreferences;
 
   @inject(FrontendApplicationStateService)
   private readonly appStateService: FrontendApplicationStateService;
@@ -74,11 +77,11 @@ export class ArduinoFrontendContribution
     }
   }
 
-  onStart(): void {
-    this.electronWindowPreferences.onPreferenceChanged((event) => {
+  onStart(app: FrontendApplication): void {
+    this.arduinoPreferences.onPreferenceChanged((event) => {
       if (event.newValue !== event.oldValue) {
         switch (event.preferenceName) {
-          case 'window.zoomLevel':
+          case 'arduino.window.zoomLevel':
             if (typeof event.newValue === 'number') {
               const webContents = remote.getCurrentWebContents();
               webContents.setZoomLevel(event.newValue || 0);
@@ -88,13 +91,16 @@ export class ArduinoFrontendContribution
       }
     });
     this.appStateService.reachedState('ready').then(() =>
-      this.electronWindowPreferences.ready.then(() => {
+      this.arduinoPreferences.ready.then(() => {
         const webContents = remote.getCurrentWebContents();
-        const zoomLevel =
-          this.electronWindowPreferences.get('window.zoomLevel');
+        const zoomLevel = this.arduinoPreferences.get(
+          'arduino.window.zoomLevel'
+        );
         webContents.setZoomLevel(zoomLevel);
       })
     );
+    // Removes the _Settings_ (cog) icon from the left sidebar
+    app.shell.leftPanelHandler.removeBottomMenu('settings-menu');
   }
 
   registerToolbarItems(registry: TabBarToolbarRegistry): void {

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 '@theia/core/shared/inversify';
 import { WidgetFactory } from '@theia/core/lib/browser/widget-manager';
 import { CommandContribution } from '@theia/core/lib/common/command';
 import { bindViewContribution } from '@theia/core/lib/browser/shell/view-contribution';
-import { TabBarToolbarContribution } 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';
@@ -50,6 +53,8 @@ import {
   DockPanelRenderer as TheiaDockPanelRenderer,
   TabBarRendererFactory,
   ContextMenuRenderer,
+  createTreeContainer,
+  TreeWidget,
 } from '@theia/core/lib/browser';
 import { MenuContribution } from '@theia/core/lib/common/menu';
 import {
@@ -79,12 +84,12 @@ 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 { ListItemRenderer } from './widgets/component-list/list-item-renderer';
 import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
-
+import {
+  MonacoThemeJson,
+  MonacoThemingService,
+} from '@theia/monaco/lib/browser/monaco-theming-service';
 import {
   ArduinoDaemonPath,
   ArduinoDaemon,
@@ -93,8 +98,6 @@ import { EditorCommandContribution as TheiaEditorCommandContribution } from '@th
 import {
   FrontendConnectionStatusService,
   ApplicationConnectionStatusContribution,
-  DaemonPort,
-  IsOnline,
 } from './theia/core/connection-status-service';
 import {
   FrontendConnectionStatusService as TheiaFrontendConnectionStatusService,
@@ -132,10 +135,11 @@ 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 { 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 { BurnBootloader } from './contributions/burn-bootloader';
@@ -179,6 +183,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,8 +207,12 @@ 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,
@@ -237,7 +247,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 +264,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,6 +277,7 @@ 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';
@@ -305,6 +319,10 @@ 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 { MonacoThemeServiceIsReady } from './utils/window';
+import { Deferred } from '@theia/core/lib/common/promise-util';
+import { StatusBarImpl } from './theia/core/status-bar';
+import { StatusBarImpl as TheiaStatusBarImpl } from '@theia/core/lib/browser';
 import { EditorMenuContribution } from './theia/editor/editor-file';
 import { EditorMenuContribution as TheiaEditorMenuContribution } from '@theia/editor/lib/browser/editor-menu';
 import { PreferencesEditorWidget as TheiaPreferencesEditorWidget } from '@theia/preferences/lib/browser/views/preference-editor-widget';
@@ -319,48 +337,32 @@ 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 registerArduinoThemes = () => {
+  const themes: MonacoThemeJson[] = [
+    {
+      id: 'arduino-theme',
+      label: 'Light (Arduino)',
+      uiTheme: 'vs',
+      json: require('../../src/browser/data/default.color-theme.json'),
+    },
+    {
+      id: 'arduino-theme-dark',
+      label: 'Dark (Arduino)',
+      uiTheme: 'vs-dark',
+      json: require('../../src/browser/data/dark.color-theme.json'),
+    },
+  ];
+  themes.forEach((theme) => MonacoThemingService.register(theme));
+};
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const global = window as any;
+const ready = global[MonacoThemeServiceIsReady] as Deferred;
+if (ready) {
+  ready.promise.then(registerArduinoThemes);
+} else {
+  registerArduinoThemes();
+}
 
 export default new ContainerModule((bind, unbind, isBound, rebind) => {
   // Commands and toolbar items
@@ -399,7 +401,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(FrontendApplicationContribution).toService(
     LibraryListWidgetFrontendContribution
   );
-  bind(OpenHandler).toService(LibraryListWidgetFrontendContribution);
 
   // Sketch list service
   bind(SketchesService)
@@ -422,8 +423,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
       )
     )
     .inSingletonScope();
-  bind(ConfigServiceClient).toSelf().inSingletonScope();
-  bind(FrontendApplicationContribution).toService(ConfigServiceClient);
 
   // Boards service
   bind(BoardsService)
@@ -468,7 +467,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(FrontendApplicationContribution).toService(
     BoardsListWidgetFrontendContribution
   );
-  bind(OpenHandler).toService(BoardsListWidgetFrontendContribution);
 
   // Board select dialog
   bind(BoardsConfigDialogWidget).toSelf().inSingletonScope();
@@ -499,7 +497,15 @@ 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(
@@ -579,6 +585,14 @@ 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(OutputChannelManager).toSelf().inSingletonScope();
   rebind(TheiaOutputChannelManager).toService(OutputChannelManager);
   bind(OutputChannelRegistryMainImpl).toSelf().inTransientScope();
@@ -590,6 +604,9 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(MonacoEditorProvider).toSelf().inSingletonScope();
   rebind(TheiaMonacoEditorProvider).toService(MonacoEditorProvider);
 
+  bind(SearchInWorkspaceWidget).toSelf();
+  rebind(TheiaSearchInWorkspaceWidget).toService(SearchInWorkspaceWidget);
+
   // Disabled reference counter in the editor manager to avoid opening the same editor (with different opener options) multiple times.
   bind(EditorManager).toSelf().inSingletonScope();
   rebind(TheiaEditorManager).toService(EditorManager);
@@ -599,6 +616,17 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     .to(SearchInWorkspaceFactory)
     .inSingletonScope();
 
+  rebind(TheiaSearchInWorkspaceResultTreeWidget).toDynamicValue(
+    ({ container }) => {
+      const childContainer = createTreeContainer(container);
+      childContainer.bind(SearchInWorkspaceResultTreeWidget).toSelf();
+      childContainer
+        .rebind(TreeWidget)
+        .toService(SearchInWorkspaceResultTreeWidget);
+      return childContainer.get(SearchInWorkspaceResultTreeWidget);
+    }
+  );
+
   // Show a disconnected status bar, when the daemon is not available
   bind(ApplicationConnectionStatusContribution).toSelf().inSingletonScope();
   rebind(TheiaApplicationConnectionStatusContribution).toService(
@@ -703,7 +731,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);
@@ -733,16 +761,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   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
@@ -827,6 +846,9 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(AboutDialog).toSelf().inSingletonScope();
   rebind(TheiaAboutDialog).toService(AboutDialog);
 
+  // To avoid running `Save All` when there are no dirty editors before starting the debug session.
+  bind(DebugSessionManager).toSelf().inSingletonScope();
+  rebind(TheiaDebugSessionManager).toService(DebugSessionManager);
   // To remove the `Run` menu item from the application menu.
   bind(DebugFrontendApplicationContribution).toSelf().inSingletonScope();
   rebind(TheiaDebugFrontendApplicationContribution).toService(
@@ -840,6 +862,10 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   bind(WidgetManager).toSelf().inSingletonScope();
   rebind(TheiaWidgetManager).toService(WidgetManager);
 
+  // To avoid running a status bar update on every single `keypress` event from the editor.
+  bind(StatusBarImpl).toSelf().inSingletonScope();
+  rebind(TheiaStatusBarImpl).toService(StatusBarImpl);
+
   // Debounced update for the tab-bar toolbar when typing in the editor.
   bind(DockPanelRenderer).toSelf();
   rebind(TheiaDockPanelRenderer).toService(DockPanelRenderer);
@@ -890,11 +916,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 +924,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 +940,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 +961,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',
@@ -970,77 +994,4 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
   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

@@ -114,12 +114,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',
@@ -250,14 +249,6 @@ export const ArduinoConfigSchema: PreferenceSchema = {
       ),
       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,
-    },
   },
 };
 
@@ -271,6 +262,7 @@ export interface ArduinoConfiguration {
   '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;
@@ -286,7 +278,6 @@ export interface ArduinoConfiguration {
   'arduino.auth.registerUri': string;
   'arduino.survey.notification': boolean;
   'arduino.cli.daemon.debug': boolean;
-  'arduino.sketch.inoBlueprint': string;
   'arduino.checkForUpdates': boolean;
 }
 

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

@@ -83,13 +83,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

@@ -174,7 +174,7 @@ export class BoardsAutoInstaller implements FrontendApplicationContribution {
     // 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
+      ({ installable, installedVersion }) => installable && !installedVersion
     );
 
     return candidates[0];

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

@@ -34,7 +34,6 @@ export class BoardsConfigDialog extends AbstractDialog<BoardsConfig.Config> {
   ) {
     super({ ...props, maxWidth: 500 });
 
-    this.node.id = 'select-board-dialog-container';
     this.contentNode.classList.add('select-board-dialog');
     this.contentNode.appendChild(this.createDescription());
 

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

@@ -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';
@@ -19,7 +19,10 @@ 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;
@@ -110,14 +113,11 @@ export class BoardsConfig extends React.Component<
           );
         }
       }),
-      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.onAttachedBoardsDidChange((event) =>
+        this.updatePorts(
+          event.newState.ports,
+          AttachedBoardsChangeEvent.diff(event).detached.ports
+        )
       ),
       this.props.boardsServiceProvider.onBoardsConfigChanged(
         ({ selectedBoard, selectedPort }) => {
@@ -132,7 +132,7 @@ export class BoardsConfig extends React.Component<
       this.props.notificationCenter.onPlatformDidUninstall(() =>
         this.updateBoards(this.state.query)
       ),
-      this.props.notificationCenter.onIndexUpdateDidComplete(() =>
+      this.props.notificationCenter.onIndexDidUpdate(() =>
         this.updateBoards(this.state.query)
       ),
       this.props.notificationCenter.onDaemonDidStart(() =>
@@ -259,12 +259,9 @@ export class BoardsConfig extends React.Component<
   override render(): React.ReactNode {
     return (
       <>
+        {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)
         )}
@@ -302,18 +299,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">
@@ -330,17 +315,19 @@ export class BoardsConfig extends React.Component<
           />
           <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>
     );
   }
@@ -355,7 +342,7 @@ export class BoardsConfig extends React.Component<
       );
     }
     return !ports.length ? (
-      <div className="no-result">
+      <div className="loading noselect">
         {nls.localize('arduino/board/noPortsDiscovered', 'No ports discovered')}
       </div>
     ) : (
@@ -387,9 +374,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>
     );

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

@@ -80,16 +80,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 +100,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 +111,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

@@ -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[] = [];
+      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

@@ -30,6 +30,7 @@ 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' },

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

@@ -63,10 +63,7 @@ export class BoardsServiceProvider
   protected readonly onAvailableBoardsChangedEmitter = new Emitter<
     AvailableBoard[]
   >();
-  protected readonly onAvailablePortsChangedEmitter = new Emitter<{
-    newState: Port[];
-    oldState: Port[];
-  }>();
+  protected readonly onAvailablePortsChangedEmitter = new Emitter<Port[]>();
   private readonly inheritedConfig = new Deferred<BoardsConfig.Config>();
 
   /**
@@ -123,12 +120,8 @@ export class BoardsServiceProvider
       const { boards: attachedBoards, ports: availablePorts } =
         AvailablePorts.split(state);
       this._attachedBoards = attachedBoards;
-      const oldState = this._availablePorts.slice();
       this._availablePorts = availablePorts;
-      this.onAvailablePortsChangedEmitter.fire({
-        newState: this._availablePorts.slice(),
-        oldState,
-      });
+      this.onAvailablePortsChangedEmitter.fire(this._availablePorts);
 
       await this.reconcileAvailableBoards();
 
@@ -158,9 +151,15 @@ export class BoardsServiceProvider
     this.lastAvailablePortsOnUpload = undefined;
   }
 
+  private portToAutoSelectCanBeDerived(): boolean {
+    return Boolean(
+      this.lastBoardsConfigOnUpload && this.lastAvailablePortsOnUpload
+    );
+  }
+
   attemptPostUploadAutoSelect(): void {
     setTimeout(() => {
-      if (this.lastBoardsConfigOnUpload && this.lastAvailablePortsOnUpload) {
+      if (this.portToAutoSelectCanBeDerived()) {
         this.attemptAutoSelect({
           ports: this._availablePorts,
           boards: this._availableBoards,
@@ -179,12 +178,12 @@ export class BoardsServiceProvider
   private deriveBoardConfigToAutoSelect(
     newState: AttachedBoardsChangeEvent['newState']
   ): void {
-    if (!this.lastBoardsConfigOnUpload || !this.lastAvailablePortsOnUpload) {
+    if (!this.portToAutoSelectCanBeDerived()) {
       this.boardConfigToAutoSelect = undefined;
       return;
     }
 
-    const oldPorts = this.lastAvailablePortsOnUpload;
+    const oldPorts = this.lastAvailablePortsOnUpload!;
     const { ports: newPorts, boards: newBoards } = newState;
 
     const appearedPorts =
@@ -199,39 +198,20 @@ export class BoardsServiceProvider
         Port.sameAs(board.port, port)
       );
 
-      const lastBoardsConfigOnUpload = this.lastBoardsConfigOnUpload;
+      const lastBoardsConfigOnUpload = this.lastBoardsConfigOnUpload!;
 
-      if (boardOnAppearedPort && lastBoardsConfigOnUpload.selectedBoard) {
-        const boardIsSameHardware = Board.hardwareIdEquals(
+      if (
+        boardOnAppearedPort &&
+        lastBoardsConfigOnUpload.selectedBoard &&
+        Board.sameAs(
           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,
+          selectedBoard: boardOnAppearedPort,
           selectedPort: port,
         };
         return;
@@ -249,12 +229,8 @@ export class BoardsServiceProvider
     }
 
     this._attachedBoards = event.newState.boards;
-    const oldState = this._availablePorts.slice();
     this._availablePorts = event.newState.ports;
-    this.onAvailablePortsChangedEmitter.fire({
-      newState: this._availablePorts.slice(),
-      oldState,
-    });
+    this.onAvailablePortsChangedEmitter.fire(this._availablePorts);
     this.reconcileAvailableBoards().then(() => {
       const { uploadInProgress } = event;
       // avoid attempting "auto-selection" while an
@@ -339,10 +315,8 @@ 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 &&
@@ -368,28 +342,9 @@ export class BoardsServiceProvider
 
   protected tryReconnect(): 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 +354,12 @@ 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;
-      // **
     }
     return false;
   }
@@ -446,16 +398,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 });
   }
 
@@ -650,7 +600,7 @@ export class BoardsServiceProvider
       boardsConfig.selectedBoard &&
       availableBoards.every(({ selected }) => !selected)
     ) {
-      let port = boardsConfig.selectedPort;
+      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.
@@ -661,7 +611,7 @@ export class BoardsServiceProvider
         // 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;
+        port = availableBoards[found].port
         availableBoards.splice(found, 1);
       }
       availableBoards.push({

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

@@ -1,11 +1,10 @@
 import { injectable } from '@theia/core/shared/inversify';
-import {
+import { BoardsListWidget } from './boards-list-widget';
+import type {
   BoardSearch,
   BoardsPackage,
 } from '../../common/protocol/boards-service';
-import { URI } from '../contributions/contribution';
 import { ListWidgetFrontendContribution } from '../widgets/component-list/list-widget-frontend-contribution';
-import { BoardsListWidget } from './boards-list-widget';
 
 @injectable()
 export class BoardsListWidgetFrontendContribution extends ListWidgetFrontendContribution<
@@ -25,16 +24,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);
+  override async initializeLayout(): Promise<void> {
+    this.openView();
   }
 }

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

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

@@ -7,16 +7,15 @@ 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';
+import { CurrentSketch } from '../../common/protocol/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 {
     registry.registerCommand(AddFile.Commands.ADD_FILE, {
@@ -32,7 +31,7 @@ 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)) {
       return;
@@ -42,12 +41,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 +79,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

@@ -2,6 +2,7 @@ import { inject, injectable } from '@theia/core/shared/inversify';
 import * as remote from '@theia/core/electron-shared/@electron/remote';
 import URI from '@theia/core/lib/common/uri';
 import { ConfirmDialog } from '@theia/core/lib/browser/dialogs';
+import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import { LibraryService, ResponseServiceClient } from '../../common/protocol';
 import { ExecuteWithProgress } from '../../common/protocol/progressible';
@@ -15,11 +16,14 @@ import { nls } from '@theia/core/lib/common';
 
 @injectable()
 export class AddZipLibrary extends SketchContribution {
+  @inject(EnvVariablesServer)
+  protected readonly envVariableServer: EnvVariablesServer;
+
   @inject(ResponseServiceClient)
-  private readonly responseService: ResponseServiceClient;
+  protected readonly responseService: ResponseServiceClient;
 
   @inject(LibraryService)
-  private readonly libraryService: LibraryService;
+  protected readonly libraryService: LibraryService;
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(AddZipLibrary.Commands.ADD_ZIP_LIBRARY, {
@@ -39,26 +43,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 {

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

@@ -1,6 +1,7 @@
 import { injectable } from '@theia/core/shared/inversify';
 import * as remote from '@theia/core/electron-shared/@electron/remote';
 import * as dateFormat from 'dateformat';
+import URI from '@theia/core/lib/common/uri';
 import { ArduinoMenus } from '../menu/arduino-menus';
 import {
   SketchContribution,
@@ -9,7 +10,7 @@ import {
   MenuModelRegistry,
 } from './contribution';
 import { nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../sketches-service-client-impl';
+import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
 
 @injectable()
 export class ArchiveSketch extends SketchContribution {
@@ -27,8 +28,11 @@ export class ArchiveSketch extends SketchContribution {
     });
   }
 
-  private async archiveSketch(): Promise<void> {
-    const sketch = await this.sketchServiceClient.currentSketch();
+  protected async archiveSketch(): Promise<void> {
+    const [sketch, config] = await Promise.all([
+      this.sketchServiceClient.currentSketch(),
+      this.configService.getConfiguration(),
+    ]);
     if (!CurrentSketch.isValid(sketch)) {
       return;
     }
@@ -36,19 +40,16 @@ export class ArchiveSketch extends SketchContribution {
       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 +57,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

@@ -5,6 +5,7 @@ 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';
@@ -50,28 +50,52 @@ export class BoardSelection extends SketchContribution {
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(BoardSelection.Commands.GET_BOARD_INFO, {
       execute: async () => {
-        const boardInfo = await getBoardInfo(
-          this.boardsServiceProvider.boardsConfig.selectedPort,
-          this.boardsService.getState()
-        );
-        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')],
+          });
+        }
       },
     });
   }
@@ -132,7 +156,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 +200,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 +240,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 +267,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,13 +279,11 @@ 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];
@@ -303,7 +319,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(
@@ -335,7 +351,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/check-for-ide-updates.ts

@@ -37,17 +37,16 @@ export class CheckForIDEUpdates extends Contribution {
   }
 
   override onReady(): void {
+    const checkForUpdates = this.preferences['arduino.checkForUpdates'];
+    if (!checkForUpdates) {
+      return;
+    }
     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(() => this.updater.checkForUpdates(true))
       .then(async (updateInfo) => {
         if (!updateInfo) return;
         const versionToSkip = await this.localStorage.getData<string>(

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

@@ -20,7 +20,7 @@ import {
   URI,
 } from './contribution';
 import { Dialog } from '@theia/core/lib/browser/dialogs';
-import { CurrentSketch } from '../sketches-service-client-impl';
+import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
 import { SaveAsSketch } from './save-as-sketch';
 
 /**
@@ -65,7 +65,7 @@ export class Close extends SketchContribution {
     registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
       commandId: Close.Commands.CLOSE.id,
       label: nls.localize('vscode/editor.contribution/close', 'Close'),
-      order: '6',
+      order: '5',
     });
   }
 
@@ -185,7 +185,7 @@ export class Close extends SketchContribution {
   private async isCurrentSketchTemp(): Promise<false | Sketch> {
     const currentSketch = await this.sketchServiceClient.currentSketch();
     if (CurrentSketch.isValid(currentSketch)) {
-      const isTemp = await this.sketchesService.isTemp(currentSketch);
+      const isTemp = await this.sketchService.isTemp(currentSketch);
       if (isTemp) {
         return currentSketch;
       }

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/contribution.ts

@@ -6,18 +6,15 @@ import {
 } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { ILogger } from '@theia/core/lib/common/logger';
-import {
-  Disposable,
-  DisposableCollection,
-} from '@theia/core/lib/common/disposable';
 import { Saveable } from '@theia/core/lib/browser/saveable';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { MaybePromise } from '@theia/core/lib/common/types';
 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 {
   MenuModelRegistry,
   MenuContribution,
@@ -44,9 +41,10 @@ import { SettingsService } from '../dialogs/settings/settings';
 import {
   CurrentSketch,
   SketchesServiceClientImpl,
-} from '../sketches-service-client-impl';
+} from '../../common/protocol/sketches-service-client-impl';
 import {
   SketchesService,
+  ConfigService,
   FileSystemExt,
   Sketch,
   CoreService,
@@ -61,12 +59,8 @@ 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 { NotificationManager } from '../theia/messages/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,
@@ -112,9 +106,6 @@ export abstract class Contribution
   @inject(FrontendApplicationStateService)
   protected readonly appStateService: FrontendApplicationStateService;
 
-  @inject(MainMenuManager)
-  protected readonly menuManager: MainMenuManager;
-
   @postConstruct()
   protected init(): void {
     this.appStateService.reachedState('ready').then(() => this.onReady());
@@ -147,11 +138,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;
@@ -165,9 +156,6 @@ export abstract class SketchContribution extends Contribution {
   @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();
@@ -181,25 +169,6 @@ 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()
@@ -222,9 +191,6 @@ export abstract class CoreServiceContribution extends SketchContribution {
   @inject(NotificationManager)
   private readonly notificationManager: NotificationManager;
 
-  @inject(ApplicationShell)
-  private readonly shell: ApplicationShell;
-
   /**
    * This is the internal (Theia) ID of the notification that is currently visible.
    * It's stored here as a field to be able to close it before executing any new core command (such as verify, upload, etc.)
@@ -287,9 +253,6 @@ export abstract class CoreServiceContribution extends SketchContribution {
     keepOutput?: boolean;
     task: (progressId: string, coreService: CoreService) => Promise<T>;
   }): Promise<T> {
-    const toDisposeOnComplete = new DisposableCollection(
-      this.maybeActivateMonitorWidget()
-    );
     const { progressText, keepOutput, task } = options;
     this.outputChannelManager
       .getChannel('Arduino')
@@ -301,26 +264,11 @@ export abstract class CoreServiceContribution extends SketchContribution {
       run: ({ progressId }) => task(progressId, this.coreService),
       keepOutput,
     });
-    toDisposeOnComplete.dispose();
     return result;
   }
 
-  // TODO: cleanup!
-  // this dependency does not belong here
-  // support core command contribution handlers, the monitor-widget should implement it and register itself as a handler
-  // the monitor widget should reveal itself after a successful core command execution
-  private maybeActivateMonitorWidget(): Disposable {
-    const currentWidget = this.shell.bottomPanel.currentTitle?.owner;
-    if (currentWidget?.id === 'serial-monitor') {
-      return Disposable.create(() =>
-        this.shell.bottomPanel.activateWidget(currentWidget)
-      );
-    }
-    return Disposable.NULL;
-  }
-
   private notificationId(message: string, ...actions: string[]): string {
-    return this.notificationManager['getMessageId']({
+    return this.notificationManager.getMessageId({
       text: message,
       actions,
       type: MessageType.Error,

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/debug.ts

@@ -3,12 +3,7 @@ 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,
@@ -18,11 +13,12 @@ import {
   TabBarToolbarRegistry,
 } from './contribution';
 import { MaybePromise, MenuModelRegistry, nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../sketches-service-client-impl';
+import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
 import { ArduinoMenus } from '../menu/arduino-menus';
 
-const COMPILE_FOR_DEBUG_KEY = 'arduino-compile-for-debug';
+import { MainMenuManager } from '../../common/main-menu-manager';
 
+const COMPILE_FOR_DEBUG_KEY = 'arduino-compile-for-debug';
 @injectable()
 export class Debug extends SketchContribution {
   @inject(HostedPluginSupport)
@@ -40,6 +36,9 @@ export class Debug extends SketchContribution {
   @inject(BoardsServiceProvider)
   private readonly boardsServiceProvider: BoardsServiceProvider;
 
+  @inject(MainMenuManager)
+  private readonly mainMenuManager: MainMenuManager;
+
   /**
    * If `undefined`, debugging is enabled. Otherwise, the reason why it's disabled.
    */
@@ -187,7 +186,7 @@ export class Debug extends SketchContribution {
     if (!CurrentSketch.isValid(sketch)) {
       return;
     }
-    const ideTempFolderUri = await this.sketchesService.getIdeTempFolderUri(
+    const ideTempFolderUri = await this.sketchService.getIdeTempFolderUri(
       sketch
     );
     const [cliPath, sketchPath, configPath] = await Promise.all([
@@ -204,28 +203,7 @@ 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)
-        );
-      }
-    }
+    return this.commandService.executeCommand('arduino.debug.start', config);
   }
 
   get compileForDebug(): boolean {
@@ -237,24 +215,7 @@ export class Debug extends SketchContribution {
     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;
+    this.mainMenuManager.update();
   }
 }
 export namespace Debug {

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

@@ -1,131 +1,32 @@
-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 { 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';
-}
+import {
+  Command,
+  CommandRegistry,
+  SketchContribution,
+  Sketch,
+} from './contribution';
 
 @injectable()
-export class DeleteSketch extends CloudSketchContribution {
-  @inject(ApplicationShell)
-  private readonly shell: ApplicationShell;
-  @inject(WindowService)
-  private readonly windowService: WindowService;
-
+export class DeleteSketch extends SketchContribution {
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(DeleteSketch.Commands.DELETE_SKETCH, {
-      execute: (params: DeleteSketchParams) => this.deleteSketch(params),
+      execute: (uri: string) => this.deleteSketch(uri),
     });
   }
 
-  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);
+  private async deleteSketch(uri: string): Promise<void> {
+    const sketch = await this.loadSketch(uri);
+    if (!sketch) {
+      console.info(`Sketch not found at ${uri}. Skipping deletion.`);
       return;
     }
-    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);
+    return this.sketchService.deleteSketch(sketch);
   }
 
   private async loadSketch(uri: string): Promise<Sketch | undefined> {
     try {
-      const sketch = await this.sketchesService.loadSketch(uri);
+      const sketch = await this.sketchService.loadSketch(uri);
       return sketch;
     } catch (err) {
       if (SketchesError.NotFound.is(err)) {
@@ -134,13 +35,6 @@ export class DeleteSketch extends CloudSketchContribution {
       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 {
@@ -149,20 +43,3 @@ export namespace DeleteSketch {
     };
   }
 }
-
-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

@@ -49,6 +49,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,11 +81,9 @@ export class EditContributions extends Contribution {
       execute: async () => {
         const value = await this.currentValue();
         if (value !== undefined) {
-          this.clipboardService.writeText(`
-\`\`\`cpp
+          this.clipboardService.writeText(`\`\`\`cpp
 ${value}
-\`\`\`
-`);
+\`\`\``);
         }
       },
     });
@@ -125,6 +147,23 @@ ${value}
       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, {
       commandId: EditContributions.Commands.FIND.id,
       label: nls.localize('vscode/findController/startFindAction', 'Find'),
@@ -181,6 +220,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',
@@ -267,6 +315,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 { CommandHandler } from '@theia/core/lib/common/command';
 import {
   MenuPath,
   CompositeMenuNode,
@@ -11,112 +11,37 @@ 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 {
   SketchContribution,
   CommandRegistry,
   MenuModelRegistry,
+  URI,
 } from './contribution';
 import { NotificationCenter } from '../notification-center';
-import {
-  Board,
-  SketchRef,
-  SketchContainer,
-  SketchesError,
-  CoreService,
-  SketchesService,
-  Sketch,
-} from '../../common/protocol';
+import { Board, SketchRef, SketchContainer } from '../../common/protocol';
 import { nls } from '@theia/core/lib/common/nls';
-import { unregisterSubmenu } from '../menu/arduino-menus';
-import { MaybePromise } from '@theia/core/lib/common/types';
-import { ApplicationError } from '@theia/core/lib/common/application-error';
-
-/**
- * Creates a cloned copy of the example sketch and opens it in a new window.
- */
-export async function openClonedExample(
-  uri: string,
-  services: {
-    sketchesService: SketchesService;
-    commandService: CommandService;
-  },
-  onError: {
-    onDidFailClone?: (
-      err: ApplicationError<
-        number,
-        {
-          uri: string;
-        }
-      >,
-      uri: string
-    ) => MaybePromise<unknown>;
-    onDidFailOpen?: (
-      err: ApplicationError<
-        number,
-        {
-          uri: string;
-        }
-      >,
-      sketch: Sketch
-    ) => MaybePromise<unknown>;
-  } = {}
-): Promise<void> {
-  const { sketchesService, commandService } = services;
-  const { onDidFailClone, onDidFailOpen } = onError;
-  try {
-    const sketch = await sketchesService.cloneExample(uri);
-    try {
-      await commandService.executeCommand(
-        OpenSketch.Commands.OPEN_SKETCH.id,
-        sketch
-      );
-    } catch (openError) {
-      if (SketchesError.NotFound.is(openError)) {
-        if (onDidFailOpen) {
-          await onDidFailOpen(openError, sketch);
-          return;
-        }
-      }
-      throw openError;
-    }
-  } catch (cloneError) {
-    if (SketchesError.NotFound.is(cloneError)) {
-      if (onDidFailClone) {
-        await onDidFailClone(cloneError, uri);
-        return;
-      }
-    }
-    throw cloneError;
-  }
-}
 
 @injectable()
 export abstract class Examples extends SketchContribution {
   @inject(CommandRegistry)
-  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 {
@@ -124,24 +49,12 @@ export abstract class Examples extends SketchContribution {
     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 {
     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.
@@ -160,7 +73,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',
       }
@@ -196,11 +109,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,30 +148,16 @@ 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)
+          .then((result) => {
+            const name = new URI(uri).path.base;
+            this.sketchService.markAsRecentlyOpened({ name, sourceUri: uri }); // no await
+            return result;
+          });
       },
     };
   }
@@ -272,10 +166,10 @@ export abstract class Examples extends SketchContribution {
 @injectable()
 export class BuiltInExamples extends Examples {
   override async onReady(): Promise<void> {
-    this.update(); // no `await`
+    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 +200,30 @@ 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;
+
+  protected readonly queue = new PQueue({ autoStart: true, concurrency: 1 });
 
   override onStart(): void {
-    this.notificationCenter.onLibraryDidInstall(() => this.update());
-    this.notificationCenter.onLibraryDidUninstall(() => this.update());
+    this.notificationCenter.onLibraryDidInstall(() => this.register());
+    this.notificationCenter.onLibraryDidUninstall(() => this.register());
   }
 
   override async onReady(): Promise<void> {
-    this.update(); // no `await`
+    this.register(); // no `await`
   }
 
   protected override handleBoardChanged(board: Board | undefined): void {
-    this.update({ board });
+    this.register(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

@@ -7,8 +7,6 @@ import {
 } from '../../common/protocol';
 import { Contribution } from './contribution';
 
-const Arduino_BuiltIn = 'Arduino_BuiltIn';
-
 @injectable()
 export class FirstStartupInstaller extends Contribution {
   @inject(LocalStorageService)
@@ -27,8 +25,8 @@ export class FirstStartupInstaller extends Contribution {
         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.
+        await this.libraryService.search({ query: 'Arduino_BuiltIn' })
+      )[0];
 
       let avrPackageError: Error | undefined;
       let builtInLibraryError: Error | undefined;
@@ -86,7 +84,7 @@ export class FirstStartupInstaller extends Contribution {
       }
       if (builtInLibraryError) {
         this.messageService.error(
-          `Could not install ${Arduino_BuiltIn} library: ${builtInLibraryError}`
+          `Could not install ${builtInLibrary.name} library: ${builtInLibraryError}`
         );
       }
 

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

@@ -17,7 +17,7 @@ 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';
+import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
 
 @injectable()
 export class IncludeLibrary extends SketchContribution {
@@ -53,7 +53,6 @@ export class IncludeLibrary extends SketchContribution {
     this.notificationCenter.onLibraryDidUninstall(() =>
       this.updateMenuActions()
     );
-    this.notificationCenter.onDidReinitialize(() => this.updateMenuActions());
   }
 
   override async onReady(): Promise<void> {

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

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

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

@@ -1,20 +1,15 @@
-import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { inject, injectable } from '@theia/core/shared/inversify';
 import { Mutex } from 'async-mutex';
+import { inject, injectable } from '@theia/core/shared/inversify';
 import {
   ArduinoDaemon,
-  assertSanitizedFqbn,
   BoardsService,
   ExecutableService,
-  sanitizeFqbn,
 } from '../../common/protocol';
-import { CurrentSketch } from '../sketches-service-client-impl';
+import { HostedPluginEvents } from '../hosted-plugin-events';
+import { SketchContribution, URI } from './contribution';
+import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
 import { BoardsConfig } from '../boards/boards-config';
 import { 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 {
@@ -33,15 +28,8 @@ export class InoLanguage extends SketchContribution {
   @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;
+  private languageServerStartMutex = new Mutex();
 
   override onReady(): void {
     const start = (
@@ -55,61 +43,27 @@ export class InoLanguage extends SketchContribution {
         }
       }
     };
-    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.boardsServiceProvider.onBoardsConfigChanged(start);
+    this.hostedPluginEvents.onPluginsDidStart(() =>
+      start(this.boardsServiceProvider.boardsConfig)
+    );
+    this.hostedPluginEvents.onPluginsWillUnload(
+      () => (this.languageServerFqbn = undefined)
+    );
+    this.preferences.onPreferenceChanged(
+      ({ preferenceName, oldValue, newValue }) => {
+        if (oldValue !== newValue) {
+          switch (preferenceName) {
+            case 'arduino.language.log':
+            case 'arduino.language.realTimeDiagnostics':
+              start(this.boardsServiceProvider.boardsConfig, true);
           }
         }
-      ),
-      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,
@@ -147,18 +101,11 @@ export class InoLanguage extends SketchContribution {
         }
         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) {
+      if (!forceStart && fqbn === this.languageServerFqbn) {
         // NOOP
         return;
       }
-      this.logger.info(`Starting language server: ${fqbnWithConfig}`);
+      this.logger.info(`Starting language server: ${fqbn}`);
       const log = this.preferences.get('arduino.language.log');
       const realTimeDiagnostics = this.preferences.get(
         'arduino.language.realTimeDiagnostics'
@@ -194,7 +141,7 @@ export class InoLanguage extends SketchContribution {
             log: currentSketchPath ? currentSketchPath : log,
             cliDaemonInstance: '1',
             board: {
-              fqbn: fqbnWithConfig,
+              fqbn,
               name: name ? `"${name}"` : undefined,
             },
             realTimeDiagnostics,
@@ -203,7 +150,7 @@ export class InoLanguage extends SketchContribution {
         ),
       ]);
     } catch (e) {
-      console.log(`Failed to start language server. Original FQBN: ${fqbn}`, e);
+      console.log(`Failed to start language server for ${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 { ArduinoMenus } from '../menu/arduino-menus';
+import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import {
   SketchContribution,
   URI,
@@ -16,12 +17,17 @@ export class NewSketch extends SketchContribution {
     registry.registerCommand(NewSketch.Commands.NEW_SKETCH, {
       execute: () => this.newSketch(),
     });
+    registry.registerCommand(NewSketch.Commands.NEW_SKETCH__TOOLBAR, {
+      isVisible: (widget) =>
+        ArduinoToolbar.is(widget) && widget.side === 'left',
+      execute: () => registry.executeCommand(NewSketch.Commands.NEW_SKETCH.id),
+    });
   }
 
   override registerMenus(registry: MenuModelRegistry): void {
     registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
       commandId: NewSketch.Commands.NEW_SKETCH.id,
-      label: nls.localize('arduino/sketch/new', 'New Sketch'),
+      label: nls.localize('arduino/sketch/new', 'New'),
       order: '0',
     });
   }
@@ -35,7 +41,7 @@ export class NewSketch extends SketchContribution {
 
   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 +54,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-recent-sketch.ts

@@ -15,7 +15,7 @@ import { MainMenuManager } from '../../common/main-menu-manager';
 import { OpenSketch } from './open-sketch';
 import { NotificationCenter } from '../notification-center';
 import { nls } from '@theia/core/lib/common';
-import { SketchesError } from '../../common/protocol';
+import { ExampleRef } from '../../common/protocol';
 
 @injectable()
 export class OpenRecentSketch extends SketchContribution {
@@ -34,7 +34,7 @@ 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 }) =>
@@ -43,12 +43,8 @@ export class OpenRecentSketch extends SketchContribution {
   }
 
   override async onReady(): Promise<void> {
-    this.update();
-  }
-
-  private update(forceUpdate?: boolean): void {
-    this.sketchesService
-      .recentlyOpenedSketches(forceUpdate)
+    this.sketchService
+      .recentlyOpenedSketches()
       .then((sketches) => this.refreshMenu(sketches));
   }
 
@@ -60,31 +56,29 @@ export class OpenRecentSketch extends SketchContribution {
     );
   }
 
-  private refreshMenu(sketches: Sketch[]): void {
+  private refreshMenu(sketches: (Sketch | ExampleRef)[]): void {
     this.register(sketches);
     this.mainMenuManager.update();
   }
 
-  protected register(sketches: Sketch[]): void {
+  protected register(sketches: (Sketch | ExampleRef)[]): void {
     const order = 0;
-    this.toDispose.dispose();
     for (const sketch of sketches) {
-      const { uri } = sketch;
+      const uri = Sketch.is(sketch) ? sketch.uri : sketch.sourceUri;
+      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;
-            }
-          }
+          const toOpen = Sketch.is(sketch)
+            ? sketch
+            : await this.sketchService.cloneExample(sketch.sourceUri);
+          this.commandRegistry.executeCommand(
+            OpenSketch.Commands.OPEN_SKETCH.id,
+            toOpen
+          );
         },
       };
       this.commandRegistry.registerCommand(command, handler);
@@ -96,7 +90,8 @@ export class OpenRecentSketch extends SketchContribution {
           order: String(order),
         }
       );
-      this.toDispose.pushAll([
+      this.toDisposeBeforeRegister.set(
+        uri,
         new DisposableCollection(
           Disposable.create(() =>
             this.commandRegistry.unregisterCommand(command)
@@ -104,8 +99,8 @@ export class OpenRecentSketch extends SketchContribution {
           Disposable.create(() =>
             this.menuRegistry.unregisterMenuAction(command)
           )
-        ),
-      ]);
+        )
+      );
     }
   }
 }

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

@@ -2,7 +2,7 @@ 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 { SketchesError } from '../../common/protocol';
 import {
   Command,
   CommandRegistry,
@@ -10,18 +10,12 @@ import {
   URI,
 } from './contribution';
 import { SaveAsSketch } from './save-as-sketch';
-import { promptMoveSketch } from './open-sketch';
-import { ApplicationError } from '@theia/core/lib/common/application-error';
-import { Deferred, wait } from '@theia/core/lib/common/promise-util';
-import { EditorWidget } from '@theia/editor/lib/browser/editor-widget';
-import { DisposableCollection } from '@theia/core/lib/common/disposable';
 
 @injectable()
 export class OpenSketchFiles extends SketchContribution {
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(OpenSketchFiles.Commands.OPEN_SKETCH_FILES, {
-      execute: (uri: URI, focusMainSketchFile) =>
-        this.openSketchFiles(uri, focusMainSketchFile),
+      execute: (uri: URI) => this.openSketchFiles(uri),
     });
     registry.registerCommand(OpenSketchFiles.Commands.ENSURE_OPENED, {
       execute: (
@@ -34,23 +28,13 @@ export class OpenSketchFiles extends SketchContribution {
     });
   }
 
-  private async openSketchFiles(
-    uri: URI,
-    focusMainSketchFile = false
-  ): Promise<void> {
+  private async openSketchFiles(uri: URI): Promise<void> {
     try {
-      const sketch = await this.sketchesService.loadSketch(uri.toString());
+      const sketch = await this.sketchService.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',
@@ -71,25 +55,9 @@ export class OpenSketchFiles extends SketchContribution {
           }
         });
       }
-      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();
+        this.openFallbackSketch();
       } else {
         console.error(err);
         const message =
@@ -103,33 +71,8 @@ export class OpenSketchFiles extends SketchContribution {
     }
   }
 
-  private async promptMove(
-    err: ApplicationError<
-      number,
-      {
-        invalidMainSketchUri: string;
-      }
-    >
-  ): Promise<Sketch | undefined> {
-    const { invalidMainSketchUri } = err.data;
-    requestAnimationFrame(() => this.messageService.error(err.message));
-    await wait(250); // let IDE2 open the editor and toast the error message, then open the modal dialog
-    const movedSketch = await promptMoveSketch(invalidMainSketchUri, {
-      fileService: this.fileService,
-      sketchesService: this.sketchesService,
-      labelProvider: this.labelProvider,
-    });
-    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();
+    const sketch = await this.sketchService.createNewSketch();
     this.workspaceService.open(new URI(sketch.uri), { preserveWindow: true });
   }
 
@@ -137,84 +80,20 @@ export class OpenSketchFiles extends SketchContribution {
     uri: string,
     forceOpen = false,
     options?: EditorOpenerOptions
-  ): Promise<EditorWidget | undefined> {
+  ): Promise<unknown> {
     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(
+    if (!widget || forceOpen) {
+      return this.editorManager.open(
         new URI(uri),
         options ?? {
           mode: 'reveal',
           preview: false,
           counter: 0,
         }
-      )
-      .then((editorWidget) => {
-        // If the widget was defined, it was already opened.
-        // The editor is expected to be attached to the shell and visible in the UI.
-        // The deferred promise does not have to wait for the `editorManager#onCreated` event.
-        // It can resolve earlier.
-        if (widget) {
-          deferred.resolve(editorWidget);
-        }
-      });
-
-    const timeout = 5_000; // number of ms IDE2 waits for the editor to show up in the UI
-    const result: EditorWidget | undefined | 'timeout' = await Promise.race([
-      deferred.promise,
-      wait(timeout).then(() => {
-        disposables.dispose();
-        return 'timeout' as const;
-      }),
-    ]);
-    if (result === 'timeout') {
-      console.warn(
-        `Timeout after ${timeout} millis. The editor has not shown up in time. URI: ${uri}`
       );
-      return undefined;
     }
-    return result;
   }
 }
 export namespace OpenSketchFiles {

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

@@ -1,50 +1,115 @@
+import { inject, injectable } from '@theia/core/shared/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,
 } 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 {
+  @inject(MenuModelRegistry)
+  protected readonly menuRegistry: MenuModelRegistry;
+
+  @inject(ContextMenuRenderer)
+  protected readonly contextMenuRenderer: ContextMenuRenderer;
+
+  @inject(BuiltInExamples)
+  protected readonly builtInExamples: BuiltInExamples;
+
+  @inject(ExamplesService)
+  protected readonly examplesService: ExamplesService;
+
+  @inject(Sketchbook)
+  protected readonly sketchbook: Sketchbook;
+
+  protected readonly toDispose = new DisposableCollection();
+
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(OpenSketch.Commands.OPEN_SKETCH, {
-      execute: 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);
         }
       },
     });
@@ -54,7 +119,7 @@ export class OpenSketch extends SketchContribution {
     registry.registerMenuAction(ArduinoMenus.FILE__SKETCH_GROUP, {
       commandId: OpenSketch.Commands.OPEN_SKETCH.id,
       label: nls.localize('vscode/workspaceActions/openFileFolder', 'Open...'),
-      order: '2',
+      order: '1',
     });
   }
 
@@ -65,37 +130,30 @@ export class OpenSketch extends SketchContribution {
     });
   }
 
-  private async openSketch(toOpen: SketchLocation | undefined): Promise<void> {
-    if (!toOpen) {
-      return;
+  async openSketch(
+    toOpen: MaybePromise<Sketch | undefined> = this.selectSketch()
+  ): Promise<void> {
+    const sketch = await toOpen;
+    if (sketch) {
+      this.workspaceService.open(new URI(sketch.uri));
     }
-    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);
   }
 
-  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'],
-          },
-        ],
-      }
+  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 +164,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 +217,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/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,35 +1,28 @@
-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 remote from '@theia/core/electron-shared/@electron/remote';
+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 { nls } from '@theia/core/lib/common';
+import { ApplicationShell, NavigatableWidget, Saveable } from '@theia/core/lib/browser';
+import { WindowService } from '@theia/core/lib/browser/window/window-service';
+import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
+import { WorkspaceInput } from '@theia/workspace/lib/browser';
+import { StartupTask } from '../../electron-common/startup-task';
 import { DeleteSketch } from './delete-sketch';
-import {
-  RenameCloudSketch,
-  RenameCloudSketchParams,
-} from './rename-cloud-sketch';
 
 @injectable()
-export class SaveAsSketch extends CloudSketchContribution {
+export class SaveAsSketch extends SketchContribution {
   @inject(ApplicationShell)
-  private readonly shell: ApplicationShell;
+  private readonly applicationShell: ApplicationShell;
+
   @inject(WindowService)
   private readonly windowService: WindowService;
 
@@ -42,7 +35,7 @@ export class SaveAsSketch extends CloudSketchContribution {
   override 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',
     });
   }
@@ -57,7 +50,7 @@ export class SaveAsSketch extends CloudSketchContribution {
   /**
    * Resolves `true` if the sketch was successfully saved as something.
    */
-  private async saveAs(
+  async saveAs(
     {
       execOnlyIfTemp,
       openAfterMove,
@@ -70,186 +63,101 @@ export class SaveAsSketch extends CloudSketchContribution {
       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) {
+    const isTemp = await this.sketchService.isTemp(sketch);
+    if (!isTemp && !!execOnlyIfTemp) {
       return false;
     }
 
-    const copiedSketch = await this.sketchesService.copy(sketch, {
+    // If target does not exist, propose a `directories.user`/${sketch.name} path
+    // If target exists, propose `directories.user`/${sketch.name}_copy_${yyyymmddHHMMss}
+    const sketchDirUri = new URI(
+      (await this.configService.getConfiguration()).sketchDirUri
+    );
+    const exists = await this.fileService.exists(
+      sketchDirUri.resolve(sketch.name)
+    );
+    const defaultUri = sketchDirUri.resolve(
+      exists
+        ? `${sketch.name}_copy_${dateFormat(new Date(), 'yyyymmddHHMMss')}`
+        : sketch.name
+    );
+    const defaultPath = await this.fileService.fsPath(defaultUri);
+    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,
     });
-    const newWorkspaceUri = copiedSketch.uri;
-
-    await saveOntoCopiedSketch(
-      sketch,
-      newWorkspaceUri,
-      this.shell,
-      this.editorManager
-    );
-    if (markAsRecentlyOpened) {
-      this.sketchesService.markAsRecentlyOpened(newWorkspaceUri);
+    if (workspaceUri) {
+      await this.saveOntoCopiedSketch(sketch.mainFileUri, sketch.uri, workspaceUri);
+      if (markAsRecentlyOpened) {
+        this.sketchService.markAsRecentlyOpened(workspaceUri);
+      }
     }
     const options: WorkspaceInput & StartupTask.Owner = {
       preserveWindow: true,
       tasks: [],
     };
-    if (openAfterMove) {
+    if (workspaceUri && openAfterMove) {
       this.windowService.setSafeToShutDown();
       if (wipeOriginal || (openAfterMove && execOnlyIfTemp)) {
         options.tasks.push({
           command: DeleteSketch.Commands.DELETE_SKETCH.id,
-          args: [{ toDelete: sketch.uri }],
+          args: [sketch.uri],
         });
       }
-      this.workspaceService.open(new URI(newWorkspaceUri), options);
+      this.workspaceService.open(new URI(workspaceUri), options);
     }
-    return !!newWorkspaceUri;
+    return !!workspaceUri;
   }
 
-  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);
-    if (!isTemp && !!execOnlyIfTemp) {
-      return undefined;
-    }
-
-    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 defaultPath = await this.fileService.fsPath(defaultUri);
-    return await this.promptLocalSketchFolderDestination(sketch, defaultPath);
-  }
-
-  /**
-   * 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 = {
@@ -274,48 +182,3 @@ export namespace SaveAsSketch {
     };
   }
 }
-
-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 { 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,
@@ -10,7 +11,7 @@ import {
   KeybindingRegistry,
 } from './contribution';
 import { nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../sketches-service-client-impl';
+import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
 
 @injectable()
 export class SaveSketch extends SketchContribution {
@@ -18,13 +19,19 @@ export class SaveSketch extends SketchContribution {
     registry.registerCommand(SaveSketch.Commands.SAVE_SKETCH, {
       execute: () => this.saveSketch(),
     });
+    registry.registerCommand(SaveSketch.Commands.SAVE_SKETCH__TOOLBAR, {
+      isVisible: (widget) =>
+        ArduinoToolbar.is(widget) && widget.side === 'left',
+      execute: () =>
+        registry.executeCommand(SaveSketch.Commands.SAVE_SKETCH.id),
+    });
   }
 
   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',
+      order: '6',
     });
   }
 
@@ -40,7 +47,7 @@ export class SaveSketch extends SketchContribution {
     if (!CurrentSketch.isValid(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 +68,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/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 {
   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, {
+    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);
@@ -43,7 +41,7 @@ export class OpenSettings extends SketchContribution {
 
   override 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',
@@ -59,13 +57,13 @@ export class OpenSettings extends SketchContribution {
 
   override 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,34 +1,50 @@
+import { inject, injectable } from '@theia/core/shared/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 {
+  CurrentSketch,
+  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 override readonly editorManager: EditorManager;
+
+  @inject(SketchesServiceClientImpl)
+  protected readonly sketchesServiceClient: SketchesServiceClientImpl;
+
+  @inject(LocalCacheFsProvider)
+  protected readonly localCacheFsProvider: LocalCacheFsProvider;
 
   protected readonly toDisposeBeforeCreateNewContextMenu =
     new DisposableCollection();
@@ -41,57 +57,107 @@ export class SketchControl extends SketchContribution {
           this.shell.getWidgets('main').indexOf(widget) !== -1,
         execute: async () => {
           this.toDisposeBeforeCreateNewContextMenu.dispose();
-
-          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 (!parentElement) {
-            return;
-          }
-
           const sketch = await this.sketchServiceClient.currentSketch();
           if (!CurrentSketch.isValid(sketch)) {
             return;
           }
 
-          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
-              )
-            )
-          );
-
-          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
-              )
-            )
+          const target = document.getElementById(
+            SketchControl.Commands.OPEN_SKETCH_CONTROL__TOOLBAR.id
           );
+          if (!(target instanceof HTMLElement)) {
+            return;
+          }
+          const { parentElement } = target;
+          if (!parentElement) {
+            return;
+          }
 
           const { mainFileUri, rootFolderFileUris } = sketch;
           const uris = [mainFileUri, ...rootFolderFileUris];
+
+          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 (
+            sketch &&
+            parentSketch &&
+            parentSketch.uri === sketch.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)
+              )
+            );
+          }
+
+          if (
+            sketch &&
+            parentSketch &&
+            parentSketch.uri === sketch.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
+                )
+              )
+            );
+          } 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)
+              )
+            );
+          }
+
           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);
         },
@@ -170,7 +235,7 @@ export class SketchControl extends SketchContribution {
     });
     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,
@@ -184,6 +249,27 @@ export class SketchControl extends SketchContribution {
       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 {

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

@@ -3,7 +3,7 @@ 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 { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
 import { Sketch, SketchContribution } from './contribution';
 import { OpenSketchFiles } from './open-sketch-files';
 
@@ -38,7 +38,7 @@ export class SketchFilesTracker extends SketchContribution {
                 type === FileChangeType.ADDED &&
                 resource.parent.toString() === sketch.uri
               ) {
-                const reloadedSketch = await this.sketchesService.loadSketch(
+                const reloadedSketch = await this.sketchService.loadSketch(
                   sketch.uri
                 );
                 if (Sketch.isInSketch(resource, reloadedSketch)) {

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

@@ -1,27 +1,44 @@
-import { injectable } from '@theia/core/shared/inversify';
+import { inject, injectable } from '@theia/core/shared/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,
+  SketchesError,
+  SketchRef,
+} 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 {
+  @inject(CommandRegistry)
+  protected override readonly commandRegistry: CommandRegistry;
+
+  @inject(MenuModelRegistry)
+  protected override readonly menuRegistry: MenuModelRegistry;
+
+  @inject(MainMenuManager)
+  protected readonly mainMenuManager: MainMenuManager;
+
+  @inject(NotificationCenter)
+  protected readonly notificationCenter: NotificationCenter;
+
   override onStart(): void {
     this.sketchServiceClient.onSketchbookDidChange(() => this.update());
-    this.configService.onDidChangeSketchDirUri(() => this.update());
   }
 
   override async onReady(): Promise<void> {
     this.update();
   }
 
-  protected override update(): void {
-    this.sketchesService.getSketches({}).then((container) => {
+  private update() {
+    this.sketchService.getSketches({}).then((container) => {
       this.register(container);
-      this.menuManager.update();
+      this.mainMenuManager.update();
     });
   }
 
@@ -33,7 +50,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],
@@ -45,19 +62,24 @@ export class Sketchbook extends Examples {
   protected override createHandler(uri: string): CommandHandler {
     return {
       execute: async () => {
+        let sketch: SketchRef | undefined = undefined;
         try {
-          await this.commandService.executeCommand(
-            OpenSketch.Commands.OPEN_SKETCH.id,
-            uri
-          );
+          sketch = await this.sketchService.loadSketch(uri);
         } catch (err) {
           if (SketchesError.NotFound.is(err)) {
-            // Force update the menu items to remove the absent sketch.
+            // To handle the following:
+            // Open IDE2, delete a sketch from sketchbook, click on File > Sketchbook > the deleted sketch.
+            // Filesystem watcher misses out delete events on macOS; hence IDE2 has no chance to update the menu items.
+            this.messageService.error(err.message);
             this.update();
-          } else {
-            throw err;
           }
         }
+        if (sketch) {
+          await this.commandService.executeCommand(
+            OpenSketch.Commands.OPEN_SKETCH.id,
+            sketch
+          );
+        }
       },
     };
   }

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

@@ -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 {
     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,6 +89,7 @@ export class UploadCertificate extends Contribution {
           args: [args.cert],
         });
       },
+      isEnabled: () => true,
     });
   }
 

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

@@ -21,11 +21,9 @@ export class UploadFirmware extends Contribution {
       execute: async () => {
         try {
           this.dialogOpened = true;
-          this.menuManager.update();
           await this.dialog.open();
         } finally {
           this.dialogOpened = false;
-          this.menuManager.update();
         }
       },
       isEnabled: () => !this.dialogOpened,

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

@@ -1,7 +1,7 @@
 import { inject, injectable } from '@theia/core/shared/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, Port } from '../../common/protocol';
+import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
 import { ArduinoToolbar } from '../toolbar/arduino-toolbar';
 import {
   Command,
@@ -11,36 +11,96 @@ import {
   TabBarToolbarRegistry,
   CoreServiceContribution,
 } from './contribution';
-import { deepClone, nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../sketches-service-client-impl';
+import { UserFieldsDialog } from '../dialogs/user-fields/user-fields-dialog';
+import { deepClone, DisposableCollection, nls } from '@theia/core/lib/common';
+import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
 import type { VerifySketchParams } from './verify-sketch';
-import { UserFields } from './user-fields';
 
 @injectable()
 export class UploadSketch extends CoreServiceContribution {
+  @inject(MenuModelRegistry)
+  private readonly menuRegistry: MenuModelRegistry;
+
+  @inject(UserFieldsDialog)
+  private readonly userFieldsDialog: UserFieldsDialog;
+
+  private boardRequiresUserFields = false;
+  private readonly cachedUserFields: Map<string, BoardUserField[]> = new Map();
+  private readonly menuActionsDisposables = new DisposableCollection();
+
   private readonly onDidChangeEmitter = new Emitter<void>();
   private readonly onDidChange = this.onDidChangeEmitter.event;
   private uploadInProgress = false;
 
-  @inject(UserFields)
-  private readonly userFields: UserFields;
+  protected override init(): void {
+    super.init();
+    this.boardsServiceProvider.onBoardsConfigChanged(async () => {
+      const userFields =
+        await this.boardsServiceProvider.selectedBoardUserFields();
+      this.boardRequiresUserFields = userFields.length > 0;
+      this.registerMenus(this.menuRegistry);
+    });
+  }
+
+  private selectedFqbnAddress(): string {
+    const { boardsConfig } = this.boardsServiceProvider;
+    const fqbn = boardsConfig.selectedBoard?.fqbn;
+    if (!fqbn) {
+      return '';
+    }
+    const address =
+      boardsConfig.selectedBoard?.port?.address ||
+      boardsConfig.selectedPort?.address;
+    if (!address) {
+      return '';
+    }
+    return fqbn + '|' + address;
+  }
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(UploadSketch.Commands.UPLOAD_SKETCH, {
       execute: async () => {
-        if (await this.userFields.checkUserFieldsDialog()) {
-          this.uploadSketch();
+        const key = this.selectedFqbnAddress();
+        if (
+          this.boardRequiresUserFields &&
+          key &&
+          !this.cachedUserFields.has(key)
+        ) {
+          // Deep clone the array of board fields to avoid editing the cached ones
+          this.userFieldsDialog.value = (
+            await this.boardsServiceProvider.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.boardsServiceProvider.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,
@@ -60,20 +120,45 @@ 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',
-    });
-
-    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.dispose();
+    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 {
@@ -106,7 +191,6 @@ export class UploadSketch extends CoreServiceContribution {
       // 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();
@@ -131,7 +215,18 @@ export class UploadSketch extends CoreServiceContribution {
         return;
       }
 
-      if (!this.userFields.checkUserFieldsForUpload()) {
+      // TODO: This does not belong here.
+      // IDE2 should not do any preliminary checks but let the CLI fail and then toast a user consumable error message.
+      if (
+        uploadOptions.userFields.length === 0 &&
+        this.boardRequiresUserFields
+      ) {
+        this.messageService.error(
+          nls.localize(
+            'arduino/sketch/userFieldsNotFoundError',
+            "Can't find user fields for connected board"
+          )
+        );
         return;
       }
 
@@ -147,11 +242,9 @@ export class UploadSketch extends CoreServiceContribution {
         { timeout: 3000 }
       );
     } catch (e) {
-      this.userFields.notifyFailedWithError(e);
       this.handleError(e);
     } finally {
       this.uploadInProgress = false;
-      this.menuManager.update();
       this.boardsServiceProvider.attemptPostUploadAutoSelect();
       this.onDidChangeEmitter.fire();
     }
@@ -165,12 +258,12 @@ export class UploadSketch extends CoreServiceContribution {
     if (!CurrentSketch.isValid(sketch)) {
       return undefined;
     }
-    const userFields = this.userFields.getUserFields();
+    const userFields = this.userFields();
     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.boardsDataStore.getData(this.sanitizeFqbn(verifyOptions.fqbn)),
         this.preferences.get('arduino.upload.verify'),
         this.preferences.get('arduino.upload.verbose'),
       ]);
@@ -207,6 +300,23 @@ export class UploadSketch extends CoreServiceContribution {
     }
     return port;
   }
+
+  private userFields(): BoardUserField[] {
+    return this.cachedUserFields.get(this.selectedFqbnAddress()) ?? [];
+  }
+
+  /**
+   * Converts the `VENDOR:ARCHITECTURE:BOARD_ID[:MENU_ID=OPTION_ID[,MENU2_ID=OPTION_ID ...]]` FQBN to
+   * `VENDOR:ARCHITECTURE:BOARD_ID` format.
+   * See the details of the `{build.fqbn}` entry in the [specs](https://arduino.github.io/arduino-cli/latest/platform-specification/#global-predefined-properties).
+   */
+  private sanitizeFqbn(fqbn: string | undefined): string | undefined {
+    if (!fqbn) {
+      return undefined;
+    }
+    const [vendor, arch, id] = fqbn.split(':');
+    return `${vendor}:${arch}:${id}`;
+  }
 }
 
 export namespace UploadSketch {
@@ -218,7 +328,7 @@ export namespace UploadSketch {
       id: 'arduino-upload-with-configuration-sketch',
       label: nls.localize(
         'arduino/sketch/configureAndUpload',
-        'Configure and Upload'
+        'Configure And Upload'
       ),
       category: 'Arduino',
     };

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

@@ -1,126 +0,0 @@
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { nls } from '@theia/core/lib/common';
-import { BoardUserField, CoreError } from '../../common/protocol';
-import { BoardsServiceProvider } from '../boards/boards-service-provider';
-import { UserFieldsDialog } from '../dialogs/user-fields/user-fields-dialog';
-import { ArduinoMenus } from '../menu/arduino-menus';
-import { MenuModelRegistry, Contribution } from './contribution';
-import { UploadSketch } from './upload-sketch';
-
-@injectable()
-export class UserFields extends Contribution {
-  private boardRequiresUserFields = false;
-  private userFieldsSet = false;
-  private readonly cachedUserFields: Map<string, BoardUserField[]> = new Map();
-
-  @inject(UserFieldsDialog)
-  private readonly userFieldsDialog: UserFieldsDialog;
-
-  @inject(BoardsServiceProvider)
-  private readonly boardsServiceProvider: BoardsServiceProvider;
-
-  protected override init(): void {
-    super.init();
-    this.boardsServiceProvider.onBoardsConfigChanged(async () => {
-      const userFields =
-        await this.boardsServiceProvider.selectedBoardUserFields();
-      this.boardRequiresUserFields = userFields.length > 0;
-      this.menuManager.update();
-    });
-  }
-
-  override registerMenus(registry: MenuModelRegistry): void {
-    registry.registerMenuAction(ArduinoMenus.SKETCH__MAIN_GROUP, {
-      commandId: UploadSketch.Commands.UPLOAD_WITH_CONFIGURATION.id,
-      label: UploadSketch.Commands.UPLOAD_WITH_CONFIGURATION.label,
-      order: '2',
-    });
-  }
-
-  private selectedFqbnAddress(): string | undefined {
-    const { boardsConfig } = this.boardsServiceProvider;
-    const fqbn = boardsConfig.selectedBoard?.fqbn;
-    if (!fqbn) {
-      return undefined;
-    }
-    const address =
-      boardsConfig.selectedBoard?.port?.address ||
-      boardsConfig.selectedPort?.address ||
-      '';
-    return fqbn + '|' + address;
-  }
-
-  private async showUserFieldsDialog(
-    key: string
-  ): Promise<BoardUserField[] | undefined> {
-    const cached = this.cachedUserFields.get(key);
-    // Deep clone the array of board fields to avoid editing the cached ones
-    this.userFieldsDialog.value = cached
-      ? cached.slice()
-      : await this.boardsServiceProvider.selectedBoardUserFields();
-    const result = await this.userFieldsDialog.open();
-    if (!result) {
-      return;
-    }
-
-    this.userFieldsSet = true;
-    this.cachedUserFields.set(key, result);
-    return result;
-  }
-
-  async checkUserFieldsDialog(forceOpen = false): Promise<boolean> {
-    const key = this.selectedFqbnAddress();
-    if (!key) {
-      return false;
-    }
-    /*
-      If the board requires to be configured with user fields, we want
-      to show the user fields dialog, but only if they weren't already
-      filled in or if they were filled in, but the previous upload failed.
-    */
-    if (
-      !forceOpen &&
-      (!this.boardRequiresUserFields ||
-        (this.cachedUserFields.has(key) && this.userFieldsSet))
-    ) {
-      return true;
-    }
-    const userFieldsFilledIn = Boolean(await this.showUserFieldsDialog(key));
-    return userFieldsFilledIn;
-  }
-
-  checkUserFieldsForUpload(): boolean {
-    // TODO: This does not belong here.
-    // IDE2 should not do any preliminary checks but let the CLI fail and then toast a user consumable error message.
-    if (!this.boardRequiresUserFields || this.getUserFields().length > 0) {
-      this.userFieldsSet = true;
-      return true;
-    }
-    this.messageService.error(
-      nls.localize(
-        'arduino/sketch/userFieldsNotFoundError',
-        "Can't find user fields for connected board"
-      )
-    );
-    this.userFieldsSet = false;
-    return false;
-  }
-
-  getUserFields(): BoardUserField[] {
-    const fqbnAddress = this.selectedFqbnAddress();
-    if (!fqbnAddress) {
-      return [];
-    }
-    return this.cachedUserFields.get(fqbnAddress) ?? [];
-  }
-
-  isRequired(): boolean {
-    return this.boardRequiresUserFields;
-  }
-
-  notifyFailedWithError(e: Error): void {
-    if (this.boardRequiresUserFields && CoreError.UploadFailed.is(e)) {
-      this.userFieldsSet = false;
-    }
-  }
-}

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

@@ -1,202 +0,0 @@
-import * as remote from '@theia/core/electron-shared/@electron/remote';
-import { Dialog } from '@theia/core/lib/browser/dialogs';
-import { nls } from '@theia/core/lib/common/nls';
-import { Deferred, waitForEvent } from '@theia/core/lib/common/promise-util';
-import { injectable } from '@theia/core/shared/inversify';
-import { WorkspaceCommands } from '@theia/workspace/lib/browser/workspace-commands';
-import { CurrentSketch } from '../sketches-service-client-impl';
-import { CloudSketchContribution } from './cloud-contribution';
-import { Sketch, URI } from './contribution';
-import { SaveAsSketch } from './save-as-sketch';
-
-@injectable()
-export class ValidateSketch extends CloudSketchContribution {
-  override onReady(): void {
-    this.validate();
-  }
-
-  private async validate(): Promise<void> {
-    const result = await this.promptFixActions();
-    if (!result) {
-      const yes = await this.prompt(
-        nls.localize('arduino/validateSketch/abortFixTitle', 'Invalid sketch'),
-        nls.localize(
-          'arduino/validateSketch/abortFixMessage',
-          "The sketch is still invalid. Do you want to fix the remaining problems? By clicking '{0}', a new sketch will open.",
-          Dialog.NO
-        ),
-        [Dialog.NO, Dialog.YES]
-      );
-      if (yes) {
-        return this.validate();
-      }
-      const sketch = await this.sketchesService.createNewSketch();
-      this.workspaceService.open(new URI(sketch.uri), {
-        preserveWindow: true,
-      });
-    }
-  }
-
-  /**
-   * Returns with an array of actions the user has to perform to fix the invalid sketch.
-   */
-  private validateSketch(
-    sketch: Sketch,
-    dataDirUri: URI | undefined
-  ): FixAction[] {
-    // sketch code file validation errors first as they do not require window reload
-    const actions = Sketch.uris(sketch)
-      .filter((uri) => uri !== sketch.mainFileUri)
-      .map((uri) => new URI(uri))
-      .filter((uri) => Sketch.Extensions.CODE_FILES.includes(uri.path.ext))
-      .map((uri) => ({
-        uri,
-        error: this.doValidate(sketch, dataDirUri, uri.path.name),
-      }))
-      .filter(({ error }) => Boolean(error))
-      .map((object) => <{ uri: URI; error: string }>object)
-      .map(({ uri, error }) => ({
-        execute: async () => {
-          const unknown =
-            (await this.promptRenameSketchFile(uri, error)) &&
-            (await this.commandService.executeCommand(
-              WorkspaceCommands.FILE_RENAME.id,
-              uri
-            ));
-          return !!unknown;
-        },
-      }));
-
-    // sketch folder + main sketch file last as it requires a `Save as...` and the window reload
-    const sketchFolderName = new URI(sketch.uri).path.base;
-    const sketchFolderNameError = this.doValidate(
-      sketch,
-      dataDirUri,
-      sketchFolderName
-    );
-    if (sketchFolderNameError) {
-      actions.push({
-        execute: async () => {
-          const unknown =
-            (await this.promptRenameSketch(sketch, sketchFolderNameError)) &&
-            (await this.commandService.executeCommand(
-              SaveAsSketch.Commands.SAVE_AS_SKETCH.id,
-              <SaveAsSketch.Options>{
-                markAsRecentlyOpened: true,
-                openAfterMove: true,
-                wipeOriginal: true,
-              }
-            ));
-          return !!unknown;
-        },
-      });
-    }
-    return actions;
-  }
-
-  private doValidate(
-    sketch: Sketch,
-    dataDirUri: URI | undefined,
-    toValidate: string
-  ): string | undefined {
-    const cloudUri = this.createFeatures.isCloud(sketch, dataDirUri);
-    return cloudUri
-      ? Sketch.validateCloudSketchFolderName(toValidate)
-      : Sketch.validateSketchFolderName(toValidate);
-  }
-
-  private async currentSketch(): Promise<Sketch> {
-    const sketch = this.sketchServiceClient.tryGetCurrentSketch();
-    if (CurrentSketch.isValid(sketch)) {
-      return sketch;
-    }
-    const deferred = new Deferred<Sketch>();
-    const disposable = this.sketchServiceClient.onCurrentSketchDidChange(
-      (sketch) => {
-        if (CurrentSketch.isValid(sketch)) {
-          disposable.dispose();
-          deferred.resolve(sketch);
-        }
-      }
-    );
-    return deferred.promise;
-  }
-
-  private async promptFixActions(): Promise<boolean> {
-    const maybeDataDirUri = this.configService.tryGetDataDirUri();
-    const [sketch, dataDirUri] = await Promise.all([
-      this.currentSketch(),
-      maybeDataDirUri ??
-        waitForEvent(this.configService.onDidChangeDataDirUri, 5_000),
-    ]);
-    const fixActions = this.validateSketch(sketch, dataDirUri);
-    for (const fixAction of fixActions) {
-      const result = await fixAction.execute();
-      if (!result) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  private async promptRenameSketch(
-    sketch: Sketch,
-    error: string
-  ): Promise<boolean> {
-    return this.prompt(
-      nls.localize(
-        'arduino/validateSketch/renameSketchFolderTitle',
-        'Invalid sketch name'
-      ),
-      nls.localize(
-        'arduino/validateSketch/renameSketchFolderMessage',
-        "The sketch '{0}' cannot be used. {1} To get rid of this message, rename the sketch. Do you want to rename the sketch now?",
-        sketch.name,
-        error
-      )
-    );
-  }
-
-  private async promptRenameSketchFile(
-    uri: URI,
-    error: string
-  ): Promise<boolean> {
-    return this.prompt(
-      nls.localize(
-        'arduino/validateSketch/renameSketchFileTitle',
-        'Invalid sketch filename'
-      ),
-      nls.localize(
-        'arduino/validateSketch/renameSketchFileMessage',
-        "The sketch file '{0}' cannot be used. {1} Do you want to rename the sketch file now?",
-        uri.path.base,
-        error
-      )
-    );
-  }
-
-  private async prompt(
-    title: string,
-    message: string,
-    buttons: string[] = [Dialog.CANCEL, Dialog.OK]
-  ): Promise<boolean> {
-    const { response } = await remote.dialog.showMessageBox(
-      remote.getCurrentWindow(),
-      {
-        title,
-        message,
-        type: 'warning',
-        buttons,
-      }
-    );
-    // cancel
-    if (response === 0) {
-      return false;
-    }
-    return true;
-  }
-}
-
-interface FixAction {
-  execute(): Promise<boolean>;
-}

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

@@ -11,7 +11,7 @@ import {
   TabBarToolbarRegistry,
 } from './contribution';
 import { nls } from '@theia/core/lib/common';
-import { CurrentSketch } from '../sketches-service-client-impl';
+import { CurrentSketch } from '../../common/protocol/sketches-service-client-impl';
 import { CoreService } from '../../common/protocol';
 import { CoreErrorHandler } from './core-error-handler';
 
@@ -21,18 +21,11 @@ export interface VerifySketchParams {
    */
   readonly exportBinaries?: boolean;
   /**
-   * If `true`, there won't be any UI indication of the verify command in the toolbar. It's `false` by default.
+   * If `true`, there won't be any UI indication of the verify command. It's `false` by default.
    */
   readonly silent?: boolean;
 }
 
-/**
- *  - `"idle"` when neither verify, nor upload is running,
- *  - `"explicit-verify"` when only verify is running triggered by the user, and
- *  - `"automatic-verify"` is when the automatic verify phase is running as part of an upload triggered by the user.
- */
-type VerifyProgress = 'idle' | 'explicit-verify' | 'automatic-verify';
-
 @injectable()
 export class VerifySketch extends CoreServiceContribution {
   @inject(CoreErrorHandler)
@@ -40,24 +33,22 @@ export class VerifySketch extends CoreServiceContribution {
 
   private readonly onDidChangeEmitter = new Emitter<void>();
   private readonly onDidChange = this.onDidChangeEmitter.event;
-  private verifyProgress: VerifyProgress = 'idle';
+  private verifyInProgress = false;
 
   override registerCommands(registry: CommandRegistry): void {
     registry.registerCommand(VerifySketch.Commands.VERIFY_SKETCH, {
       execute: (params?: VerifySketchParams) => this.verifySketch(params),
-      isEnabled: () => this.verifyProgress === 'idle',
+      isEnabled: () => !this.verifyInProgress,
     });
     registry.registerCommand(VerifySketch.Commands.EXPORT_BINARIES, {
       execute: () => this.verifySketch({ exportBinaries: true }),
-      isEnabled: () => this.verifyProgress === 'idle',
+      isEnabled: () => !this.verifyInProgress,
     });
     registry.registerCommand(VerifySketch.Commands.VERIFY_SKETCH_TOOLBAR, {
       isVisible: (widget) =>
         ArduinoToolbar.is(widget) && widget.side === 'left',
-      isEnabled: () => this.verifyProgress !== 'explicit-verify',
-      // toggled only when verify is running, but not toggled when automatic verify is running before the upload
-      // https://github.com/arduino/arduino-ide/pull/1750#pullrequestreview-1214762975
-      isToggled: () => this.verifyProgress === 'explicit-verify',
+      isEnabled: () => !this.verifyInProgress,
+      isToggled: () => this.verifyInProgress,
       execute: () =>
         registry.executeCommand(VerifySketch.Commands.VERIFY_SKETCH.id),
     });
@@ -108,16 +99,15 @@ export class VerifySketch extends CoreServiceContribution {
   private async verifySketch(
     params?: VerifySketchParams
   ): Promise<CoreService.Options.Compile | undefined> {
-    if (this.verifyProgress !== 'idle') {
+    if (this.verifyInProgress) {
       return undefined;
     }
 
     try {
-      this.verifyProgress = params?.silent
-        ? 'automatic-verify'
-        : 'explicit-verify';
-      this.onDidChangeEmitter.fire();
-      this.menuManager.update();
+      if (!params?.silent) {
+        this.verifyInProgress = true;
+        this.onDidChangeEmitter.fire();
+      }
       this.clearVisibleNotification();
       this.coreErrorHandler.reset();
 
@@ -149,9 +139,10 @@ export class VerifySketch extends CoreServiceContribution {
       this.handleError(e);
       return undefined;
     } finally {
-      this.verifyProgress = 'idle';
-      this.onDidChangeEmitter.fire();
-      this.menuManager.update();
+      this.verifyInProgress = false;
+      if (!params?.silent) {
+        this.onDidChangeEmitter.fire();
+      }
     }
   }
 

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

@@ -1,37 +1,80 @@
-import { MaybePromise } from '@theia/core/lib/common/types';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { fetch } from 'cross-fetch';
-import { SketchesService } from '../../common/protocol';
-import { uint8ArrayToString } from '../../common/utils';
-import { ArduinoPreferences } from '../arduino-preferences';
-import { AuthenticationClientService } from '../auth/authentication-client-service';
-import { SketchCache } from '../widgets/cloud-sketchbook/cloud-sketch-cache';
+import { injectable, inject } from '@theia/core/shared/inversify';
 import * as createPaths from './create-paths';
 import { posix } from './create-paths';
+import { AuthenticationClientService } from '../auth/authentication-client-service';
+import { ArduinoPreferences } from '../arduino-preferences';
+import { SketchCache } from '../widgets/cloud-sketchbook/cloud-sketch-cache';
 import { Create, CreateError } from './typings';
 
-interface ResponseResultProvider {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+export interface ResponseResultProvider {
   (response: Response): Promise<any>;
 }
-namespace ResponseResultProvider {
+export namespace ResponseResultProvider {
   export const NOOP: ResponseResultProvider = async () => undefined;
   export const TEXT: ResponseResultProvider = (response) => response.text();
   export const JSON: ResponseResultProvider = (response) => response.json();
 }
 
+export function Utf8ArrayToStr(array: Uint8Array): string {
+  let out, i, c;
+  let char2, char3;
+
+  out = '';
+  const len = array.length;
+  i = 0;
+  while (i < len) {
+    c = array[i++];
+    switch (c >> 4) {
+      case 0:
+      case 1:
+      case 2:
+      case 3:
+      case 4:
+      case 5:
+      case 6:
+      case 7:
+        // 0xxxxxxx
+        out += String.fromCharCode(c);
+        break;
+      case 12:
+      case 13:
+        // 110x xxxx   10xx xxxx
+        char2 = array[i++];
+        out += String.fromCharCode(((c & 0x1f) << 6) | (char2 & 0x3f));
+        break;
+      case 14:
+        // 1110 xxxx  10xx xxxx  10xx xxxx
+        char2 = array[i++];
+        char3 = array[i++];
+        out += String.fromCharCode(
+          ((c & 0x0f) << 12) | ((char2 & 0x3f) << 6) | ((char3 & 0x3f) << 0)
+        );
+        break;
+    }
+  }
+
+  return out;
+}
+
 type ResourceType = 'f' | 'd';
 
 @injectable()
 export class CreateApi {
   @inject(SketchCache)
-  readonly sketchCache: SketchCache;
-  @inject(AuthenticationClientService)
-  private readonly authenticationService: AuthenticationClientService;
-  @inject(ArduinoPreferences)
-  private readonly arduinoPreferences: ArduinoPreferences;
-  @inject(SketchesService)
-  private readonly sketchesService: SketchesService;
+  protected sketchCache: SketchCache;
+
+  protected authenticationService: AuthenticationClientService;
+  protected arduinoPreferences: ArduinoPreferences;
+
+  public init(
+    authenticationService: AuthenticationClientService,
+    arduinoPreferences: ArduinoPreferences
+  ): CreateApi {
+    this.authenticationService = authenticationService;
+    this.arduinoPreferences = arduinoPreferences;
+
+    return this;
+  }
 
   getSketchSecretStat(sketch: Create.Sketch): Create.Resource {
     return {
@@ -57,30 +100,6 @@ export class CreateApi {
     return result;
   }
 
-  /**
-   * `sketchPath` is not the POSIX path but the path with the user UUID, username, etc.
-   * See [Create.Resource#path](./typings.ts). If `cache` is `true` and a sketch exists with the path,
-   * the cache will be updated with the new state of the sketch.
-   */
-  // TODO: no nulls in API
-  async sketchByPath(
-    sketchPath: string,
-    cache = false
-  ): Promise<Create.Sketch | null> {
-    const url = new URL(`${this.domain()}/sketches/byPath/${sketchPath}`);
-    const headers = await this.headers();
-    const sketch = await this.run<Create.Sketch>(url, {
-      method: 'GET',
-      headers,
-    });
-    if (sketch && cache) {
-      this.sketchCache.addSketch(sketch);
-      const posixPath = createPaths.toPosixPath(sketch.path);
-      this.sketchCache.purgeByPath(posixPath);
-    }
-    return sketch;
-  }
-
   async sketches(limit = 50): Promise<Create.Sketch[]> {
     const url = new URL(`${this.domain()}/sketches`);
     url.searchParams.set('user_id', 'me');
@@ -110,22 +129,14 @@ export class CreateApi {
 
   async createSketch(
     posixPath: string,
-    contentProvider: MaybePromise<string> = this.sketchesService.defaultInoContent(),
-    payloadOverride: Record<
-      string,
-      string | boolean | number | Record<string, unknown>
-    > = {}
+    content: string = CreateApi.defaultInoContent
   ): Promise<Create.Sketch> {
     const url = new URL(`${this.domain()}/sketches`);
-    const [headers, content] = await Promise.all([
-      this.headers(),
-      contentProvider,
-    ]);
+    const headers = await this.headers();
     const payload = {
       ino: btoa(content),
       path: posixPath,
       user_id: 'me',
-      ...payloadOverride,
     };
     const init = {
       method: 'PUT',
@@ -241,17 +252,7 @@ export class CreateApi {
         return data;
       }
 
-      const posixPath = createPaths.parentPosix(path);
-      let sketch = this.sketchCache.getSketch(posixPath);
-      // Workaround for https://github.com/arduino/arduino-ide/issues/1999.
-      if (!sketch) {
-        // Convert the ordinary sketch POSIX path to the Create path.
-        // For example, `/sketch_apr6a` will be transformed to `8a694e4b83878cc53472bd75ee928053:kittaakos/sketches_v2/sketch_apr6a`.
-        const createPathPrefix = this.sketchCache.createPathPrefix;
-        if (createPathPrefix) {
-          sketch = await this.sketchByPath(createPathPrefix + posixPath, true);
-        }
-      }
+      const sketch = this.sketchCache.getSketch(createPaths.parentPosix(path));
 
       if (
         sketch &&
@@ -290,7 +291,7 @@ export class CreateApi {
       this.sketchCache.addSketch(sketch);
 
       let file = '';
-      if (sketch.secrets) {
+      if (sketch && sketch.secrets) {
         for (const item of sketch.secrets) {
           file += `#define ${item.name} "${item.value}"\r\n`;
         }
@@ -327,9 +328,10 @@ export class CreateApi {
       if (sketch) {
         const url = new URL(`${this.domain()}/sketches/${sketch.id}`);
         const headers = await this.headers();
+
         // parse the secret file
         const secrets = (
-          typeof content === 'string' ? content : uint8ArrayToString(content)
+          typeof content === 'string' ? content : Utf8ArrayToStr(content)
         )
           .split(/\r?\n/)
           .reduce((prev, curr) => {
@@ -379,7 +381,7 @@ export class CreateApi {
       return;
     }
 
-    // do not upload "do_not_sync" files/directories and their descendants
+    // do not upload "do_not_sync" files/directoris and their descendants
     const segments = posixPath.split(posix.sep) || [];
     if (
       segments.some((segment) => Create.do_not_sync_files.includes(segment))
@@ -393,7 +395,7 @@ export class CreateApi {
     const headers = await this.headers();
 
     let data: string =
-      typeof content === 'string' ? content : uint8ArrayToString(content);
+      typeof content === 'string' ? content : Utf8ArrayToStr(content);
     data = await this.toggleSecretsInclude(posixPath, data, 'remove');
 
     const payload = { data: btoa(data) };
@@ -413,21 +415,6 @@ export class CreateApi {
     await this.delete(posixPath, 'd');
   }
 
-  /**
-   * `sketchPath` is not the POSIX path but the path with the user UUID, username, etc.
-   * See [Create.Resource#path](./typings.ts). Unlike other endpoints, it does not support the `$HOME`
-   * variable substitution. The DELETE directory endpoint is bogus and responses with HTTP 500
-   * instead of 404 when deleting a non-existing resource.
-   */
-  async deleteSketch(sketchPath: string): Promise<void> {
-    const url = new URL(`${this.domain()}/sketches/byPath/${sketchPath}`);
-    const headers = await this.headers();
-    await this.run(url, {
-      method: 'DELETE',
-      headers,
-    });
-  }
-
   private async delete(posixPath: string, type: ResourceType): Promise<void> {
     const url = new URL(
       `${this.domain()}/files/${type}/$HOME/sketches_v2${posixPath}`
@@ -487,18 +474,15 @@ export class CreateApi {
     await this.run(url, init, ResponseResultProvider.NOOP);
   }
 
-  private fetchCounter = 0;
   private async run<T>(
-    requestInfo: URL,
+    requestInfo: RequestInfo | URL,
     init: RequestInit | undefined,
     resultProvider: ResponseResultProvider = ResponseResultProvider.JSON
   ): Promise<T> {
-    const fetchCount = `[${++this.fetchCounter}]`;
-    const fetchStart = performance.now();
-    const method = init?.method ? `${init.method}: ` : '';
-    const url = requestInfo.toString();
-    const response = await fetch(requestInfo.toString(), init);
-    const fetchEnd = performance.now();
+    const response = await fetch(
+      requestInfo instanceof URL ? requestInfo.toString() : requestInfo,
+      init
+    );
     if (!response.ok) {
       let details: string | undefined = undefined;
       try {
@@ -509,18 +493,7 @@ export class CreateApi {
       const { statusText, status } = response;
       throw new CreateError(statusText, status, details);
     }
-    const parseStart = performance.now();
     const result = await resultProvider(response);
-    const parseEnd = performance.now();
-    console.debug(
-      `HTTP ${fetchCount} ${method} ${url} [fetch: ${(
-        fetchEnd - fetchStart
-      ).toFixed(2)} ms, parse: ${(parseEnd - parseStart).toFixed(
-        2
-      )} ms] body: ${
-        typeof result === 'string' ? result : JSON.stringify(result)
-      }`
-    );
     return result;
   }
 
@@ -543,3 +516,19 @@ export class CreateApi {
     return this.authenticationService.session?.accessToken || '';
   }
 }
+
+export namespace CreateApi {
+  export const defaultInoContent = `/*
+
+*/
+
+void setup() {
+  
+}
+
+void loop() {
+  
+}
+
+`;
+}

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

@@ -1,142 +0,0 @@
-import { FrontendApplicationContribution } from '@theia/core/lib/browser/frontend-application';
-import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { Emitter, Event } from '@theia/core/lib/common/event';
-import URI from '@theia/core/lib/common/uri';
-import { inject, injectable } from '@theia/core/shared/inversify';
-import { Sketch } from '../../common/protocol';
-import { AuthenticationSession } from '../../node/auth/types';
-import { ArduinoPreferences } from '../arduino-preferences';
-import { AuthenticationClientService } from '../auth/authentication-client-service';
-import { LocalCacheFsProvider } from '../local-cache/local-cache-fs-provider';
-import { CreateUri } from './create-uri';
-
-export type CloudSketchState = 'push' | 'pull';
-
-@injectable()
-export class CreateFeatures implements FrontendApplicationContribution {
-  @inject(ArduinoPreferences)
-  private readonly preferences: ArduinoPreferences;
-  @inject(AuthenticationClientService)
-  private readonly authenticationService: AuthenticationClientService;
-  @inject(LocalCacheFsProvider)
-  private readonly localCacheFsProvider: LocalCacheFsProvider;
-
-  /**
-   * The keys are the Create URI of the sketches.
-   */
-  private readonly _cloudSketchStates = new Map<string, CloudSketchState>();
-  private readonly onDidChangeSessionEmitter = new Emitter<
-    AuthenticationSession | undefined
-  >();
-  private readonly onDidChangeEnabledEmitter = new Emitter<boolean>();
-  private readonly onDidChangeCloudSketchStateEmitter = new Emitter<{
-    uri: URI;
-    state: CloudSketchState | undefined;
-  }>();
-  private readonly toDispose = new DisposableCollection(
-    this.onDidChangeSessionEmitter,
-    this.onDidChangeEnabledEmitter,
-    this.onDidChangeCloudSketchStateEmitter
-  );
-  private _enabled: boolean;
-  private _session: AuthenticationSession | undefined;
-
-  onStart(): void {
-    this.toDispose.pushAll([
-      this.authenticationService.onSessionDidChange((session) => {
-        const oldSession = this._session;
-        this._session = session;
-        if (!!oldSession !== !!this._session) {
-          this.onDidChangeSessionEmitter.fire(this._session);
-        }
-      }),
-      this.preferences.onPreferenceChanged(({ preferenceName, newValue }) => {
-        if (preferenceName === 'arduino.cloud.enabled') {
-          const oldEnabled = this._enabled;
-          this._enabled = Boolean(newValue);
-          if (this._enabled !== oldEnabled) {
-            this.onDidChangeEnabledEmitter.fire(this._enabled);
-          }
-        }
-      }),
-    ]);
-    this._enabled = this.preferences['arduino.cloud.enabled'];
-    this._session = this.authenticationService.session;
-  }
-
-  onStop(): void {
-    this.toDispose.dispose();
-  }
-
-  get onDidChangeSession(): Event<AuthenticationSession | undefined> {
-    return this.onDidChangeSessionEmitter.event;
-  }
-
-  get onDidChangeEnabled(): Event<boolean> {
-    return this.onDidChangeEnabledEmitter.event;
-  }
-
-  get onDidChangeCloudSketchState(): Event<{
-    uri: URI;
-    state: CloudSketchState | undefined;
-  }> {
-    return this.onDidChangeCloudSketchStateEmitter.event;
-  }
-
-  get session(): AuthenticationSession | undefined {
-    return this._session;
-  }
-
-  get enabled(): boolean {
-    return this._enabled;
-  }
-
-  cloudSketchState(uri: URI): CloudSketchState | undefined {
-    return this._cloudSketchStates.get(uri.toString());
-  }
-
-  setCloudSketchState(uri: URI, state: CloudSketchState | undefined): void {
-    if (uri.scheme !== CreateUri.scheme) {
-      throw new Error(
-        `Expected a URI with '${uri.scheme}' scheme. Got: ${uri.toString()}`
-      );
-    }
-    const key = uri.toString();
-    if (!state) {
-      if (!this._cloudSketchStates.delete(key)) {
-        console.warn(
-          `Could not reset the cloud sketch state of ${key}. No state existed for the the cloud sketch.`
-        );
-      } else {
-        this.onDidChangeCloudSketchStateEmitter.fire({ uri, state: undefined });
-      }
-    } else {
-      this._cloudSketchStates.set(key, state);
-      this.onDidChangeCloudSketchStateEmitter.fire({ uri, state });
-    }
-  }
-
-  /**
-   * `true` if the sketch is under `directories.data/RemoteSketchbook`. Otherwise, `false`.
-   * Returns with `undefined` if `dataDirUri` is `undefined`.
-   */
-  isCloud(sketch: Sketch, dataDirUri: URI | undefined): boolean | undefined {
-    if (!dataDirUri) {
-      console.warn(
-        `Could not decide whether the sketch ${sketch.uri} is cloud or local. The 'directories.data' location was not available from the CLI config.`
-      );
-      return undefined;
-    }
-    return dataDirUri
-      .resolve('RemoteSketchbook')
-      .resolve('ArduinoCloud')
-      .isEqualOrParent(new URI(sketch.uri));
-  }
-
-  cloudUri(sketch: Sketch): URI | undefined {
-    if (!this.session) {
-      return undefined;
-    }
-    return this.localCacheFsProvider.from(new URI(sketch.uri));
-  }
-}

arduino-ide-extension/src/browser/create/create-fs-provider.ts

@@ -29,7 +29,6 @@ import { CreateUri } from './create-uri';
 import { SketchesService } from '../../common/protocol';
 import { ArduinoPreferences } from '../arduino-preferences';
 import { Create } from './typings';
-import { stringToUint8Array } from '../../common/utils';
 
 @injectable()
 export class CreateFsProvider
@@ -155,7 +154,7 @@ export class CreateFsProvider
 
   async readFile(uri: URI): Promise<Uint8Array> {
     const content = await this.getCreateApi.readFile(uri.path.toString());
-    return stringToUint8Array(content);
+    return new TextEncoder().encode(content);
   }
 
   async writeFile(
@@ -190,6 +189,10 @@ export class CreateFsProvider
         FileSystemProviderErrorCode.NoPermissions
       );
     }
-    return this.createApi;
+
+    return this.createApi.init(
+      this.authenticationService,
+      this.arduinoPreferences
+    );
   }
 }

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

@@ -1,4 +1,4 @@
-import { URI as Uri } from '@theia/core/shared/vscode-uri';
+import { URI as Uri } from 'vscode-uri';
 import URI from '@theia/core/lib/common/uri';
 import { toPosixPath, parentPosix, posix } from './create-paths';
 import { Create } from './typings';
@@ -7,9 +7,7 @@ export namespace CreateUri {
   export const scheme = 'arduino-create';
   export const root = toUri(posix.sep);
 
-  export function toUri(
-    posixPathOrResource: string | Create.Resource | Create.Sketch
-  ): URI {
+  export function toUri(posixPathOrResource: string | Create.Resource): URI {
     const posixPath =
       typeof posixPathOrResource === 'string'
         ? posixPathOrResource

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

@@ -71,23 +71,3 @@ export class CreateError extends Error {
     Object.setPrototypeOf(this, CreateError.prototype);
   }
 }
-
-export type ConflictError = CreateError & { status: 409 };
-export function isConflict(err: unknown): err is ConflictError {
-  return isErrorWithStatusOf(err, 409);
-}
-
-export type NotFoundError = CreateError & { status: 404 };
-export function isNotFound(err: unknown): err is NotFoundError {
-  return isErrorWithStatusOf(err, 404);
-}
-
-function isErrorWithStatusOf(
-  err: unknown,
-  status: number
-): err is CreateError & { status: number } {
-  if (err instanceof CreateError) {
-    return err.status === status;
-  }
-  return false;
-}

arduino-ide-extension/src/browser/data/dark.color-theme.json

@@ -14,7 +14,7 @@
     "editor.foreground": "#dae3e3",
     "editor.lineHighlightBackground": "#434f5410",
     "editor.selectionBackground": "#00818480",
-    "editorCursor.foreground": "#dae3e3",
+    "editorCursor.foreground": "#434f54",
     "editorWhitespace.foreground": "#bfbfbf",
     "editorWidget.background": "#171e21",
     "editorWidget.foreground": "#dae3e3",
@@ -67,8 +67,7 @@
     "tree.indentGuidesStroke": "#374146",
     "tab.unfocusedActiveForeground": "#dae3e3",
     "tab.inactiveBackground": "#171e21",
-    "textLink.foreground": "#0ca1a6",
-    "errorForeground": "#df7365"
+    "textLink.foreground": "#0ca1a6"
   },
   "tokenColors": [
     {

arduino-ide-extension/src/browser/data/default.color-theme.json

@@ -14,7 +14,7 @@
     "editor.foreground": "#4e5b61",
     "editor.lineHighlightBackground": "#434f5410",
     "editor.selectionBackground": "#7fcbcdb3",
-    "editorCursor.foreground": "#4e5b61",
+    "editorCursor.foreground": "#434f54",
     "editorWhitespace.foreground": "#bfbfbf",
     "editorWidget.background": "#f7f9f9",
     "editorWidget.foreground": "#4e5b61",
@@ -67,8 +67,7 @@
     "tree.indentGuidesStroke": "#dae3e3",
     "tab.unfocusedActiveForeground": "#4e5b61",
     "tab.inactiveBackground": "#ecf1f1",
-    "textLink.foreground": "#008184",
-    "errorForeground": "#df7365"
+    "textLink.foreground": "#008184"
   },
   "tokenColors": [
     {

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

@@ -171,9 +171,6 @@ export class UploadCertificateDialog extends AbstractDialog<void> {
       Widget.detach(this.widget);
     }
     Widget.attach(this.widget, this.contentNode);
-    const firstButton = this.widget.node.querySelector('button');
-    firstButton?.focus();
-
     this.widget.busyCallback = this.busyCallback.bind(this);
     super.onAfterAttach(msg);
     this.update();

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

@@ -2,7 +2,7 @@ import * as React from '@theia/core/shared/react';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { Widget } from '@theia/core/shared/@phosphor/widgets';
 import { Message } from '@theia/core/shared/@phosphor/messaging';
-import { clipboard } from '@theia/core/electron-shared/@electron/remote';
+import { clipboard } from 'electron';
 import { ReactWidget, DialogProps } from '@theia/core/lib/browser';
 import { AbstractDialog } from '../theia/dialogs/dialogs';
 import { CreateApi } from '../create/create-api';

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

@@ -5,8 +5,10 @@ import {
   postConstruct,
 } from '@theia/core/shared/inversify';
 import { DialogProps } from '@theia/core/lib/browser/dialogs';
-import { ReactDialog } from '../../theia/dialogs/dialogs';
+import { AbstractDialog } from '../../theia/dialogs/dialogs';
+import { Widget } from '@theia/core/shared/@phosphor/widgets';
 import { Message } from '@theia/core/shared/@phosphor/messaging';
+import { ReactWidget } from '@theia/core/lib/browser/widgets/react-widget';
 import {
   AvailableBoard,
   BoardsServiceProvider,
@@ -21,30 +23,26 @@ import { Port } from '../../../common/protocol';
 import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state';
 
 @injectable()
-export class UploadFirmwareDialogProps extends DialogProps {}
-
-@injectable()
-export class UploadFirmwareDialog extends ReactDialog<void> {
+export class UploadFirmwareDialogWidget extends ReactWidget {
   @inject(BoardsServiceProvider)
-  private readonly boardsServiceClient: BoardsServiceProvider;
+  protected readonly boardsServiceClient: BoardsServiceProvider;
+
   @inject(ArduinoFirmwareUploader)
-  private readonly arduinoFirmwareUploader: ArduinoFirmwareUploader;
+  protected readonly arduinoFirmwareUploader: ArduinoFirmwareUploader;
+
   @inject(FrontendApplicationStateService)
   private readonly appStatusService: FrontendApplicationStateService;
 
-  private updatableFqbns: string[] = [];
-  private availableBoards: AvailableBoard[] = [];
-  private isOpen = new Object();
-  private busy = false;
+  protected updatableFqbns: string[] = [];
+  protected availableBoards: AvailableBoard[] = [];
+  protected isOpen = new Object();
 
-  constructor(
-    @inject(UploadFirmwareDialogProps)
-    protected override readonly props: UploadFirmwareDialogProps
-  ) {
-    super({ title: UploadFirmware.Commands.OPEN.label || '' });
-    this.node.id = 'firmware-uploader-dialog-container';
-    this.contentNode.classList.add('firmware-uploader-dialog');
-    this.acceptButton = undefined;
+  public busyCallback = (busy: boolean) => {
+    return;
+  };
+
+  constructor() {
+    super();
   }
 
   @postConstruct()
@@ -61,34 +59,77 @@ export class UploadFirmwareDialog extends ReactDialog<void> {
     });
   }
 
+  protected flashFirmware(firmware: FirmwareInfo, port: Port): Promise<any> {
+    this.busyCallback(true);
+    return this.arduinoFirmwareUploader
+      .flash(firmware, port)
+      .finally(() => this.busyCallback(false));
+  }
+
+  protected override onCloseRequest(msg: Message): void {
+    super.onCloseRequest(msg);
+    this.isOpen = new Object();
+  }
+
+  protected render(): React.ReactNode {
+    return (
+      <form>
+        <FirmwareUploaderComponent
+          availableBoards={this.availableBoards}
+          firmwareUploader={this.arduinoFirmwareUploader}
+          flashFirmware={this.flashFirmware.bind(this)}
+          updatableFqbns={this.updatableFqbns}
+          isOpen={this.isOpen}
+        />
+      </form>
+    );
+  }
+}
+
+@injectable()
+export class UploadFirmwareDialogProps extends DialogProps {}
+
+@injectable()
+export class UploadFirmwareDialog extends AbstractDialog<void> {
+  @inject(UploadFirmwareDialogWidget)
+  protected readonly widget: UploadFirmwareDialogWidget;
+
+  private busy = false;
+
+  constructor(
+    @inject(UploadFirmwareDialogProps)
+    protected override readonly props: UploadFirmwareDialogProps
+  ) {
+    super({ title: UploadFirmware.Commands.OPEN.label || '' });
+    this.node.id = 'firmware-uploader-dialog-container';
+    this.contentNode.classList.add('firmware-uploader-dialog');
+    this.acceptButton = undefined;
+  }
+
   get value(): void {
     return;
   }
 
-  protected override render(): React.ReactNode {
-    return (
-      <div>
-        <form>
-          <FirmwareUploaderComponent
-            availableBoards={this.availableBoards}
-            firmwareUploader={this.arduinoFirmwareUploader}
-            flashFirmware={this.flashFirmware.bind(this)}
-            updatableFqbns={this.updatableFqbns}
-            isOpen={this.isOpen}
-          />
-        </form>
-      </div>
-    );
-  }
-
   protected override onAfterAttach(msg: Message): void {
-    const firstButton = this.node.querySelector('button');
-    firstButton?.focus();
+    if (this.widget.isAttached) {
+      Widget.detach(this.widget);
+    }
+    Widget.attach(this.widget, this.contentNode);
+    this.widget.busyCallback = this.busyCallback.bind(this);
     super.onAfterAttach(msg);
     this.update();
   }
 
-  // eslint-disable-next-line unused-imports/no-unused-vars, @typescript-eslint/no-unused-vars
+  protected override onUpdateRequest(msg: Message): void {
+    super.onUpdateRequest(msg);
+    this.widget.update();
+  }
+
+  protected override onActivateRequest(msg: Message): void {
+    super.onActivateRequest(msg);
+    this.widget.activate();
+  }
+
   protected override handleEnter(event: KeyboardEvent): boolean | void {
     return false;
   }
@@ -97,11 +138,11 @@ export class UploadFirmwareDialog extends ReactDialog<void> {
     if (this.busy) {
       return;
     }
+    this.widget.close();
     super.close();
-    this.isOpen = new Object();
   }
 
-  private busyCallback(busy: boolean): void {
+  busyCallback(busy: boolean): void {
     this.busy = busy;
     if (busy) {
       this.closeCrossNode.classList.add('disabled');
@@ -109,11 +150,4 @@ export class UploadFirmwareDialog extends ReactDialog<void> {
       this.closeCrossNode.classList.remove('disabled');
     }
   }
-
-  private flashFirmware(firmware: FirmwareInfo, port: Port): Promise<any> {
-    this.busyCallback(true);
-    return this.arduinoFirmwareUploader
-      .flash(firmware, port)
-      .finally(() => this.busyCallback(false));
-  }
 }

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

@@ -1,6 +1,7 @@
 import { nls } from '@theia/core/lib/common';
-import { shell } from '@theia/core/electron-shared/@electron/remote';
+import { shell } from 'electron';
 import * as React from '@theia/core/shared/react';
+import * as ReactDOM from '@theia/core/shared/react-dom';
 import ReactMarkdown from 'react-markdown';
 import { ProgressInfo, UpdateInfo } from '../../../common/protocol/ide-updater';
 import ProgressBar from '../../components/ProgressBar';
@@ -27,19 +28,32 @@ export const IDEUpdaterComponent = ({
   },
 }: IDEUpdaterComponentProps): React.ReactElement => {
   const { version, releaseNotes } = updateInfo;
-  const [changelog, setChangelog] = React.useState<string>('');
+  const changelogDivRef =
+    React.useRef() as React.MutableRefObject<HTMLDivElement>;
   React.useEffect(() => {
-    if (releaseNotes) {
-      setChangelog(
-        typeof releaseNotes === 'string'
-          ? releaseNotes
-          : releaseNotes.reduce(
-              (acc, item) => (item.note ? (acc += `${item.note}\n\n`) : acc),
-              ''
-            )
+    if (!!releaseNotes && changelogDivRef.current) {
+      let changelog: string;
+      if (typeof releaseNotes === 'string') changelog = releaseNotes;
+      else
+        changelog = releaseNotes.reduce((acc, item) => {
+          return item.note ? (acc += `${item.note}\n\n`) : acc;
+        }, '');
+      ReactDOM.render(
+        <ReactMarkdown
+          components={{
+            a: ({ href, children, ...props }) => (
+              <a onClick={() => href && shell.openExternal(href)} {...props}>
+                {children}
+              </a>
+            ),
+          }}
+        >
+          {changelog}
+        </ReactMarkdown>,
+        changelogDivRef.current
       );
     }
-  }, [releaseNotes, changelog]);
+  }, [updateInfo]);
 
   const DownloadCompleted: () => React.ReactElement = () => (
     <div className="ide-updater-dialog--downloaded">
@@ -92,24 +106,9 @@ export const IDEUpdaterComponent = ({
             version
           )}
         </div>
-        {changelog && (
+        {releaseNotes && (
           <div className="dialogRow changelog-container">
-            <div className="changelog">
-              <ReactMarkdown
-                components={{
-                  a: ({ href, children, ...props }) => (
-                    <a
-                      onClick={() => href && shell.openExternal(href)}
-                      {...props}
-                    >
-                      {children}
-                    </a>
-                  ),
-                }}
-              >
-                {changelog}
-              </ReactMarkdown>
-            </div>
+            <div className="changelog" ref={changelogDivRef} />
           </div>
         )}
       </div>

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

@@ -5,8 +5,10 @@ import {
   postConstruct,
 } from '@theia/core/shared/inversify';
 import { DialogProps } from '@theia/core/lib/browser/dialogs';
+import { AbstractDialog } from '../../theia/dialogs/dialogs';
+import { Widget } from '@theia/core/shared/@phosphor/widgets';
 import { Message } from '@theia/core/shared/@phosphor/messaging';
-import { ReactDialog } from '../../theia/dialogs/dialogs';
+import { ReactWidget } from '@theia/core/lib/browser/widgets/react-widget';
 import { nls } from '@theia/core';
 import { IDEUpdaterComponent, UpdateProgress } from './ide-updater-component';
 import {
@@ -20,11 +22,47 @@ import { WindowService } from '@theia/core/lib/browser/window/window-service';
 
 const DOWNLOAD_PAGE_URL = 'https://www.arduino.cc/en/software';
 
+@injectable()
+export class IDEUpdaterDialogWidget extends ReactWidget {
+  private _updateInfo: UpdateInfo;
+  private _updateProgress: UpdateProgress = {};
+
+  setUpdateInfo(updateInfo: UpdateInfo): void {
+    this._updateInfo = updateInfo;
+    this.update();
+  }
+
+  mergeUpdateProgress(updateProgress: UpdateProgress): void {
+    this._updateProgress = { ...this._updateProgress, ...updateProgress };
+    this.update();
+  }
+
+  get updateInfo(): UpdateInfo {
+    return this._updateInfo;
+  }
+
+  get updateProgress(): UpdateProgress {
+    return this._updateProgress;
+  }
+
+  protected render(): React.ReactNode {
+    return !!this._updateInfo ? (
+      <IDEUpdaterComponent
+        updateInfo={this._updateInfo}
+        updateProgress={this._updateProgress}
+      />
+    ) : null;
+  }
+}
+
 @injectable()
 export class IDEUpdaterDialogProps extends DialogProps {}
 
 @injectable()
-export class IDEUpdaterDialog extends ReactDialog<UpdateInfo | undefined> {
+export class IDEUpdaterDialog extends AbstractDialog<UpdateInfo> {
+  @inject(IDEUpdaterDialogWidget)
+  private readonly widget: IDEUpdaterDialogWidget;
+
   @inject(IDEUpdater)
   private readonly updater: IDEUpdater;
 
@@ -37,9 +75,6 @@ export class IDEUpdaterDialog extends ReactDialog<UpdateInfo | undefined> {
   @inject(WindowService)
   private readonly windowService: WindowService;
 
-  private _updateInfo: UpdateInfo | undefined;
-  private _updateProgress: UpdateProgress = {};
-
   constructor(
     @inject(IDEUpdaterDialogProps)
     protected override readonly props: IDEUpdaterDialogProps
@@ -59,34 +94,26 @@ export class IDEUpdaterDialog extends ReactDialog<UpdateInfo | undefined> {
   protected init(): void {
     this.updaterClient.onUpdaterDidFail((error) => {
       this.appendErrorButtons();
-      this.mergeUpdateProgress({ error });
+      this.widget.mergeUpdateProgress({ error });
     });
     this.updaterClient.onDownloadProgressDidChange((progressInfo) => {
-      this.mergeUpdateProgress({ progressInfo });
+      this.widget.mergeUpdateProgress({ progressInfo });
     });
     this.updaterClient.onDownloadDidFinish(() => {
       this.appendInstallButtons();
-      this.mergeUpdateProgress({ downloadFinished: true });
+      this.widget.mergeUpdateProgress({ downloadFinished: true });
     });
   }
 
-  protected render(): React.ReactNode {
-    return (
-      this.updateInfo && (
-        <IDEUpdaterComponent
-          updateInfo={this.updateInfo}
-          updateProgress={this.updateProgress}
-        />
-      )
-    );
-  }
-
-  get value(): UpdateInfo | undefined {
-    return this.updateInfo;
+  get value(): UpdateInfo {
+    return this.widget.updateInfo;
   }
 
   protected override onAfterAttach(msg: Message): void {
-    this.update();
+    if (this.widget.isAttached) {
+      Widget.detach(this.widget);
+    }
+    Widget.attach(this.widget, this.contentNode);
     this.appendInitialButtons();
     super.onAfterAttach(msg);
   }
@@ -169,19 +196,15 @@ export class IDEUpdaterDialog extends ReactDialog<UpdateInfo | undefined> {
   }
 
   private skipVersion(): void {
-    if (!this.updateInfo) {
-      console.warn(`Nothing to skip. No update info is available`);
-      return;
-    }
     this.localStorageService.setData<string>(
       SKIP_IDE_VERSION,
-      this.updateInfo.version
+      this.widget.updateInfo.version
     );
     this.close();
   }
 
   private startDownload(): void {
-    this.mergeUpdateProgress({
+    this.widget.mergeUpdateProgress({
       downloadStarted: true,
     });
     this.clearButtons();
@@ -193,48 +216,31 @@ export class IDEUpdaterDialog extends ReactDialog<UpdateInfo | undefined> {
     this.close();
   }
 
-  private set updateInfo(updateInfo: UpdateInfo | undefined) {
-    this._updateInfo = updateInfo;
-    this.update();
-  }
-
-  private get updateInfo(): UpdateInfo | undefined {
-    return this._updateInfo;
-  }
-
-  private get updateProgress(): UpdateProgress {
-    return this._updateProgress;
-  }
-
-  private mergeUpdateProgress(updateProgress: UpdateProgress): void {
-    this._updateProgress = { ...this._updateProgress, ...updateProgress };
-    this.update();
-  }
-
   override async open(
     data: UpdateInfo | undefined = undefined
   ): Promise<UpdateInfo | undefined> {
     if (data && data.version) {
-      this.mergeUpdateProgress({
+      this.widget.mergeUpdateProgress({
         progressInfo: undefined,
         downloadStarted: false,
         downloadFinished: false,
         error: undefined,
       });
-      this.updateInfo = data;
+      this.widget.setUpdateInfo(data);
       return super.open();
     }
   }
 
   protected override onActivateRequest(msg: Message): void {
     super.onActivateRequest(msg);
-    this.update();
+    this.widget.activate();
   }
 
   override close(): void {
+    this.widget.dispose();
     if (
-      this.updateProgress?.downloadStarted &&
-      !this.updateProgress?.downloadFinished
+      this.widget.updateProgress?.downloadStarted &&
+      !this.widget.updateProgress?.downloadFinished
     ) {
       this.updater.stopDownload();
     }

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

@@ -10,7 +10,6 @@ import { FileDialogService } from '@theia/filesystem/lib/browser/file-dialog/fil
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import {
   AdditionalUrls,
-  CompilerWarnings,
   CompilerWarningLiterals,
   Network,
   ProxySettings,
@@ -23,28 +22,14 @@ import {
   LanguageInfo,
 } from '@theia/core/lib/common/i18n/localization';
 import SettingsStepInput from './settings-step-input';
-import { InterfaceScale } from '../../contributions/interface-scale';
-import {
-  userConfigurableThemes,
-  themeLabelForSettings,
-  arduinoThemeTypeOf,
-} from '../../theia/core/theming';
-import { Theme } from '@theia/core/lib/common/theme';
 
-const maxScale = InterfaceScale.ZoomLevel.toPercentage(
-  InterfaceScale.ZoomLevel.MAX
-);
-const minScale = InterfaceScale.ZoomLevel.toPercentage(
-  InterfaceScale.ZoomLevel.MIN
-);
-const scaleStep = InterfaceScale.ZoomLevel.Step.toPercentage(
-  InterfaceScale.ZoomLevel.STEP
-);
-
-const maxFontSize = InterfaceScale.FontSize.MAX;
-const minFontSize = InterfaceScale.FontSize.MIN;
-const fontSizeStep = InterfaceScale.FontSize.STEP;
+const maxScale = 280;
+const minScale = -60;
+const scaleStep = 20;
 
+const maxFontSize = 72;
+const minFontSize = 0;
+const fontSizeStep = 2;
 export class SettingsComponent extends React.Component<
   SettingsComponent.Props,
   SettingsComponent.State
@@ -186,8 +171,7 @@ export class SettingsComponent extends React.Component<
           <div className="column">
             <div className="flex-line">
               <SettingsStepInput
-                key={`font-size-stepper-${String(this.state.editorFontSize)}`}
-                initialValue={this.state.editorFontSize}
+                value={this.state.editorFontSize}
                 setSettingsStateValue={this.setFontSize}
                 step={fontSizeStep}
                 maxValue={maxFontSize}
@@ -206,28 +190,29 @@ export class SettingsComponent extends React.Component<
               </label>
               <div>
                 <SettingsStepInput
-                  key={`scale-stepper-${String(scalePercentage)}`}
-                  initialValue={scalePercentage}
+                  value={scalePercentage}
                   setSettingsStateValue={this.setInterfaceScale}
                   step={scaleStep}
                   maxValue={maxScale}
                   minValue={minScale}
                   unitOfMeasure="%"
-                  classNames={{
-                    input: 'theia-input small with-margin',
-                    buttonsContainer:
-                      'settings-step-input-buttons-container-perc',
-                  }}
+                  classNames={{ input: 'theia-input small with-margin' }}
                 />
               </div>
             </div>
             <div className="flex-line">
               <select
                 className="theia-select"
-                value={this.currentThemeLabel}
+                value={ThemeService.get().getCurrentTheme().label}
                 onChange={this.themeDidChange}
               >
-                {this.themeSelectOptions}
+                {ThemeService.get()
+                  .getThemes()
+                  .map(({ id, label }) => (
+                    <option key={id} value={label}>
+                      {label}
+                    </option>
+                  ))}
               </select>
             </div>
             <div className="flex-line">
@@ -275,7 +260,7 @@ export class SettingsComponent extends React.Component<
               >
                 {CompilerWarningLiterals.map((value) => (
                   <option key={value} value={value}>
-                    {CompilerWarnings.labelOf(value)}
+                    {value}
                   </option>
                 ))}
               </select>
@@ -335,46 +320,6 @@ export class SettingsComponent extends React.Component<
     );
   }
 
-  private get currentThemeLabel(): string {
-    const currentTheme = this.props.themeService.getCurrentTheme();
-    return themeLabelForSettings(currentTheme);
-  }
-
-  private get separatedThemes(): (Theme | string)[] {
-    const separatedThemes: (Theme | string)[] = [];
-    const groupedThemes = userConfigurableThemes(this.props.themeService);
-    for (const group of groupedThemes) {
-      for (let i = 0; i < group.length; i++) {
-        const theme = group[i];
-        if (i === 0 && separatedThemes.length) {
-          const arduinoThemeType = arduinoThemeTypeOf(theme);
-          separatedThemes.push(`separator-${arduinoThemeType}`);
-        }
-        separatedThemes.push(theme);
-      }
-    }
-    return separatedThemes;
-  }
-
-  private get themeSelectOptions(): React.ReactNode[] {
-    return this.separatedThemes.map((item) => {
-      if (typeof item === 'string') {
-        return (
-          // &#9472; -> BOX DRAWINGS LIGHT HORIZONTAL
-          <option key={item} disabled>
-            &#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;&#9472;
-          </option>
-        );
-      }
-      const label = themeLabelForSettings(item);
-      return (
-        <option key={item.id} value={label}>
-          {label}
-        </option>
-      );
-    });
-  }
-
   private toSelectOptions(language: string | LanguageInfo): JSX.Element {
     const plain = typeof language === 'string';
     const key = plain ? language : language.languageId;
@@ -448,27 +393,15 @@ export class SettingsComponent extends React.Component<
                 }
                 onChange={this.socksProtocolDidChange}
               />
-              SOCKS5
+              SOCKS
             </label>
           </form>
           <div className="flex-line proxy-settings">
             <div className="column">
-              <div className="flex-line">{`${nls.localize(
-                'arduino/preferences/proxySettings/hostname',
-                'Host name'
-              )}:`}</div>
-              <div className="flex-line">{`${nls.localize(
-                'arduino/preferences/proxySettings/port',
-                'Port number'
-              )}:`}</div>
-              <div className="flex-line">{`${nls.localize(
-                'arduino/preferences/proxySettings/username',
-                'Username'
-              )}:`}</div>
-              <div className="flex-line">{`${nls.localize(
-                'arduino/preferences/proxySettings/password',
-                'Password'
-              )}:`}</div>
+              <div className="flex-line">Host name:</div>
+              <div className="flex-line">Port number:</div>
+              <div className="flex-line">Username:</div>
+              <div className="flex-line">Password:</div>
             </div>
             <div className="column stretch">
               <div className="flex-line">
@@ -569,7 +502,6 @@ export class SettingsComponent extends React.Component<
       canSelectFiles: false,
       canSelectMany: false,
       canSelectFolders: true,
-      modal: true,
     });
     if (uri) {
       const sketchbookPath = await this.props.fileService.fsPath(uri);
@@ -608,7 +540,8 @@ export class SettingsComponent extends React.Component<
   };
 
   private setInterfaceScale = (percentage: number) => {
-    const interfaceScale = InterfaceScale.ZoomLevel.fromPercentage(percentage);
+    const interfaceScale = (percentage - 100) / 20;
+
     this.setState({ interfaceScale });
   };
 
@@ -652,11 +585,11 @@ export class SettingsComponent extends React.Component<
     event: React.ChangeEvent<HTMLSelectElement>
   ): void => {
     const { selectedIndex } = event.target.options;
-    const theme = this.separatedThemes[selectedIndex];
-    if (theme && typeof theme !== 'string') {
+    const theme = ThemeService.get().getThemes()[selectedIndex];
+    if (theme) {
       this.setState({ themeId: theme.id });
-      if (this.props.themeService.getCurrentTheme().id !== theme.id) {
-        this.props.themeService.setCurrentTheme(theme.id);
+      if (ThemeService.get().getCurrentTheme().id !== theme.id) {
+        ThemeService.get().setCurrentTheme(theme.id);
       }
     }
   };
@@ -724,7 +657,7 @@ export class SettingsComponent extends React.Component<
   ): void => {
     if (this.state.network !== 'none') {
       const network = this.cloneProxySettings;
-      network.protocol = event.target.checked ? 'http' : 'socks5';
+      network.protocol = event.target.checked ? 'http' : 'socks';
       this.setState({ network });
     }
   };
@@ -734,7 +667,7 @@ export class SettingsComponent extends React.Component<
   ): void => {
     if (this.state.network !== 'none') {
       const network = this.cloneProxySettings;
-      network.protocol = event.target.checked ? 'socks5' : 'http';
+      network.protocol = event.target.checked ? 'socks' : 'http';
       this.setState({ network });
     }
   };
@@ -795,7 +728,6 @@ export namespace SettingsComponent {
     readonly fileDialogService: FileDialogService;
     readonly windowService: WindowService;
     readonly localizationProvider: AsyncLocalizationProvider;
-    readonly themeService: ThemeService;
   }
   export type State = Settings & {
     rawAdditionalUrlsValue: string;

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

@@ -35,9 +35,6 @@ export class SettingsWidget extends ReactWidget {
   @inject(AsyncLocalizationProvider)
   protected readonly localizationProvider: AsyncLocalizationProvider;
 
-  @inject(ThemeService)
-  private readonly themeService: ThemeService;
-
   protected render(): React.ReactNode {
     return (
       <SettingsComponent
@@ -46,7 +43,6 @@ export class SettingsWidget extends ReactWidget {
         fileDialogService={this.fileDialogService}
         windowService={this.windowService}
         localizationProvider={this.localizationProvider}
-        themeService={this.themeService}
       />
     );
   }
@@ -63,9 +59,6 @@ export class SettingsDialog extends AbstractDialog<Promise<Settings>> {
   @inject(SettingsWidget)
   protected readonly widget: SettingsWidget;
 
-  @inject(ThemeService)
-  private readonly themeService: ThemeService;
-
   constructor(
     @inject(SettingsDialogProps)
     protected override readonly props: SettingsDialogProps
@@ -128,11 +121,11 @@ export class SettingsDialog extends AbstractDialog<Promise<Settings>> {
   }
 
   override async open(): Promise<Promise<Settings> | undefined> {
-    const themeIdBeforeOpen = this.themeService.getCurrentTheme().id;
+    const themeIdBeforeOpen = ThemeService.get().getCurrentTheme().id;
     const result = await super.open();
     if (!result) {
-      if (this.themeService.getCurrentTheme().id !== themeIdBeforeOpen) {
-        this.themeService.setCurrentTheme(themeIdBeforeOpen);
+      if (ThemeService.get().getCurrentTheme().id !== themeIdBeforeOpen) {
+        ThemeService.get().setCurrentTheme(themeIdBeforeOpen);
       }
     }
     return result;
@@ -162,6 +155,7 @@ export class AdditionalUrlsDialog extends AbstractDialog<string[]> {
 
     this.textArea = document.createElement('textarea');
     this.textArea.className = 'theia-input';
+    this.textArea.setAttribute('style', 'flex: 0;');
     this.textArea.value = urls
       .filter((url) => url.trim())
       .filter((url) => !!url)
@@ -187,10 +181,10 @@ export class AdditionalUrlsDialog extends AbstractDialog<string[]> {
     );
     this.contentNode.appendChild(anchor);
 
+    this.appendAcceptButton(nls.localize('vscode/issueMainService/ok', 'OK'));
     this.appendCloseButton(
       nls.localize('vscode/issueMainService/cancel', 'Cancel')
     );
-    this.appendAcceptButton(nls.localize('vscode/issueMainService/ok', 'OK'));
   }
 
   get value(): string[] {

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

@@ -2,7 +2,7 @@ import * as React from '@theia/core/shared/react';
 import classnames from 'classnames';
 
 interface SettingsStepInputProps {
-  initialValue: number;
+  value: number;
   setSettingsStateValue: (value: number) => void;
   step: number;
   maxValue: number;
@@ -15,7 +15,7 @@ const SettingsStepInput: React.FC<SettingsStepInputProps> = (
   props: SettingsStepInputProps
 ) => {
   const {
-    initialValue,
+    value,
     setSettingsStateValue,
     step,
     maxValue,
@@ -24,35 +24,18 @@ const SettingsStepInput: React.FC<SettingsStepInputProps> = (
     classNames,
   } = props;
 
-  const [valueState, setValueState] = React.useState<{
-    currentValue: number;
-    isEmptyString: boolean;
-  }>({
-    currentValue: initialValue,
-    isEmptyString: false,
-  });
-  const { currentValue, isEmptyString } = valueState;
-
   const clamp = (value: number, min: number, max: number): number => {
     return Math.min(Math.max(value, min), max);
   };
 
-  const resetToInitialState = (): void => {
-    setValueState({
-      currentValue: initialValue,
-      isEmptyString: false,
-    });
-  };
-
   const onStep = (
     roundingOperation: 'ceil' | 'floor',
     stepOperation: (a: number, b: number) => number
   ): void => {
-    const valueRoundedToScale =
-      Math[roundingOperation](currentValue / step) * step;
+    const valueRoundedToScale = Math[roundingOperation](value / step) * step;
     const calculatedValue =
-      valueRoundedToScale === currentValue
-        ? stepOperation(currentValue, step)
+      valueRoundedToScale === value
+        ? stepOperation(value, step)
         : valueRoundedToScale;
     const newValue = clamp(calculatedValue, minValue, maxValue);
 
@@ -69,53 +52,33 @@ const SettingsStepInput: React.FC<SettingsStepInputProps> = (
 
   const onUserInput = (event: React.ChangeEvent<HTMLInputElement>): void => {
     const { value: eventValue } = event.target;
-    setValueState({
-      currentValue: Number(eventValue),
-      isEmptyString: eventValue === '',
-    });
-  };
 
-  /* Prevent the user from entering invalid values */
-  const onBlur = (event: React.FocusEvent): void => {
-    if (
-      (currentValue === initialValue && !isEmptyString) ||
-      event.currentTarget.contains(event.relatedTarget as Node)
-    ) {
-      return;
+    if (eventValue === '') {
+      setSettingsStateValue(0);
     }
 
-    const clampedValue = clamp(currentValue, minValue, maxValue);
-    if (clampedValue === initialValue || isNaN(currentValue) || isEmptyString) {
-      resetToInitialState();
-      return;
-    }
+    const number = Number(eventValue);
 
-    setSettingsStateValue(clampedValue);
+    if (!isNaN(number) && number !== value) {
+      const newValue = clamp(number, minValue, maxValue);
+
+      setSettingsStateValue(newValue);
+    }
   };
 
-  const valueIsNotWithinRange =
-    currentValue < minValue || currentValue > maxValue;
-  const isDisabledException =
-    valueIsNotWithinRange || isEmptyString || isNaN(currentValue);
-
-  const upDisabled = isDisabledException || currentValue >= maxValue;
-  const downDisabled = isDisabledException || currentValue <= minValue;
+  const upDisabled = value >= maxValue;
+  const downDisabled = value <= minValue;
 
   return (
-    <div className="settings-step-input-container" onBlur={onBlur}>
+    <div className="settings-step-input-container">
       <input
         className={classnames('settings-step-input-element', classNames?.input)}
-        value={isEmptyString ? '' : String(currentValue)}
+        value={value.toString()}
         onChange={onUserInput}
         type="number"
         pattern="[0-9]+"
       />
-      <div
-        className={classnames(
-          'settings-step-input-buttons-container',
-          classNames?.buttonsContainer
-        )}
-      >
+      <div className="settings-step-input-buttons-container">
         <button
           className="settings-step-input-button settings-step-input-up-button"
           disabled={upDisabled}

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

@@ -5,7 +5,7 @@ import {
 } from '@theia/core/shared/inversify';
 import URI from '@theia/core/lib/common/uri';
 import { Emitter } from '@theia/core/lib/common/event';
-import { Deferred } from '@theia/core/lib/common/promise-util';
+import { Deferred, timeout } from '@theia/core/lib/common/promise-util';
 import { deepClone } from '@theia/core/lib/common/objects';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { ThemeService } from '@theia/core/lib/browser/theming';
@@ -25,21 +25,17 @@ import {
   LanguageInfo,
 } from '@theia/core/lib/common/i18n/localization';
 import { ElectronCommands } from '@theia/core/lib/electron-browser/menu/electron-menu-contribution';
-import { DefaultTheme } from '@theia/application-package/lib/application-props';
-import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
-import type { FileStat } from '@theia/filesystem/lib/common/files';
 
-export const WINDOW_SETTING = 'window';
 export const EDITOR_SETTING = 'editor';
 export const FONT_SIZE_SETTING = `${EDITOR_SETTING}.fontSize`;
 export const AUTO_SAVE_SETTING = `files.autoSave`;
 export const QUICK_SUGGESTIONS_SETTING = `${EDITOR_SETTING}.quickSuggestions`;
 export const ARDUINO_SETTING = 'arduino';
-export const ARDUINO_WINDOW_SETTING = `${ARDUINO_SETTING}.window`;
+export const WINDOW_SETTING = `${ARDUINO_SETTING}.window`;
 export const COMPILE_SETTING = `${ARDUINO_SETTING}.compile`;
 export const UPLOAD_SETTING = `${ARDUINO_SETTING}.upload`;
 export const SKETCHBOOK_SETTING = `${ARDUINO_SETTING}.sketchbook`;
-export const AUTO_SCALE_SETTING = `${ARDUINO_WINDOW_SETTING}.autoScale`;
+export const AUTO_SCALE_SETTING = `${WINDOW_SETTING}.autoScale`;
 export const ZOOM_LEVEL_SETTING = `${WINDOW_SETTING}.zoomLevel`;
 export const COMPILE_VERBOSE_SETTING = `${COMPILE_SETTING}.verbose`;
 export const COMPILE_WARNINGS_SETTING = `${COMPILE_SETTING}.warnings`;
@@ -57,7 +53,7 @@ export interface Settings {
   currentLanguage: string;
 
   autoScaleInterface: boolean; // `arduino.window.autoScale`
-  interfaceScale: number; // `window.zoomLevel`
+  interfaceScale: number; // `arduino.window.zoomLevel` https://github.com/eclipse-theia/theia/issues/8751
   verboseOnCompile: boolean; // `arduino.compile.verbose`
   compilerWarnings: CompilerWarnings; // `arduino.compile.warnings`
   verboseOnUpload: boolean; // `arduino.upload.verbose`
@@ -105,9 +101,6 @@ export class SettingsService {
   @inject(CommandService)
   protected commandService: CommandService;
 
-  @inject(ThemeService)
-  private readonly themeService: ThemeService;
-
   protected readonly onDidChangeEmitter = new Emitter<Readonly<Settings>>();
   readonly onDidChange = this.onDidChangeEmitter.event;
   protected readonly onDidResetEmitter = new Emitter<Readonly<Settings>>();
@@ -123,17 +116,6 @@ export class SettingsService {
       this._settings = deepClone(settings);
       this.ready.resolve();
     });
-    this.preferenceService.onPreferenceChanged(async (event) => {
-      await this.ready.promise;
-      const { preferenceName, newValue } = event;
-      if (
-        preferenceName === 'workbench.colorTheme' &&
-        typeof newValue === 'string' &&
-        this._settings.themeId !== newValue
-      ) {
-        this.reset();
-      }
-    });
   }
 
   protected async loadSettings(): Promise<Settings> {
@@ -159,9 +141,10 @@ export class SettingsService {
       this.preferenceService.get<number>(FONT_SIZE_SETTING, 12),
       this.preferenceService.get<string>(
         'workbench.colorTheme',
-        DefaultTheme.defaultForOSTheme(
-          FrontendApplicationConfigProvider.get().defaultTheme
-        )
+        window.matchMedia &&
+          window.matchMedia('(prefers-color-scheme: dark)').matches
+          ? 'arduino-theme-dark'
+          : 'arduino-theme'
       ),
       this.preferenceService.get<Settings.AutoSave>(
         AUTO_SAVE_SETTING,
@@ -183,15 +166,7 @@ export class SettingsService {
       this.preferenceService.get<boolean>(SHOW_ALL_FILES_SETTING, false),
       this.configService.getConfiguration(),
     ]);
-    const {
-      config = {
-        additionalUrls: [],
-        sketchDirUri: '',
-        network: Network.Default(),
-      },
-    } = cliConfig;
-    const { additionalUrls, sketchDirUri, network } = config;
-
+    const { additionalUrls, sketchDirUri, network } = cliConfig;
     const sketchbookPath = await this.fileService.fsPath(new URI(sketchDirUri));
     return {
       editorFontSize,
@@ -243,11 +218,7 @@ export class SettingsService {
     try {
       const { sketchbookPath, editorFontSize, themeId } = await settings;
       const sketchbookDir = await this.fileSystemExt.getUri(sketchbookPath);
-      let sketchbookStat: FileStat | undefined = undefined;
-      try {
-        sketchbookStat = await this.fileService.resolve(new URI(sketchbookDir));
-      } catch {}
-      if (!sketchbookStat || !sketchbookStat.isDirectory) {
+      if (!(await this.fileService.exists(new URI(sketchbookDir)))) {
         return nls.localize(
           'arduino/preferences/invalid.sketchbook.location',
           'Invalid sketchbook location: {0}',
@@ -260,7 +231,11 @@ export class SettingsService {
           'Invalid editor font size. It must be a positive integer.'
         );
       }
-      if (!this.themeService.getThemes().find(({ id }) => id === themeId)) {
+      if (
+        !ThemeService.get()
+          .getThemes()
+          .find(({ id }) => id === themeId)
+      ) {
         return nls.localize(
           'arduino/preferences/invalid.theme',
           'Invalid theme.'
@@ -277,6 +252,7 @@ export class SettingsService {
 
   private async savePreference(name: string, value: unknown): Promise<void> {
     await this.preferenceService.set(name, value, PreferenceScope.User);
+    await timeout(5);
   }
 
   async save(): Promise<string | true> {
@@ -298,38 +274,28 @@ export class SettingsService {
       network,
       sketchbookShowAllFiles,
     } = this._settings;
-    const [cliConfig, sketchDirUri] = await Promise.all([
+    const [config, sketchDirUri] = await Promise.all([
       this.configService.getConfiguration(),
       this.fileSystemExt.getUri(sketchbookPath),
     ]);
-    const { config } = cliConfig;
-    if (!config) {
-      // Do not check for any error messages. The config might has errors (such as invalid directories.user) right before saving the new values.
-      return nls.localize(
-        'arduino/preferences/noCliConfig',
-        'Could not load the CLI configuration'
-      );
-    }
-
     (config as any).additionalUrls = additionalUrls;
     (config as any).sketchDirUri = sketchDirUri;
     (config as any).network = network;
     (config as any).locale = currentLanguage;
 
-    await Promise.all([
-      this.savePreference('editor.fontSize', editorFontSize),
-      this.savePreference('workbench.colorTheme', themeId),
-      this.savePreference(AUTO_SAVE_SETTING, autoSave),
-      this.savePreference('editor.quickSuggestions', quickSuggestions),
-      this.savePreference(AUTO_SCALE_SETTING, autoScaleInterface),
-      this.savePreference(ZOOM_LEVEL_SETTING, interfaceScale),
-      this.savePreference(COMPILE_VERBOSE_SETTING, verboseOnCompile),
-      this.savePreference(COMPILE_WARNINGS_SETTING, compilerWarnings),
-      this.savePreference(UPLOAD_VERBOSE_SETTING, verboseOnUpload),
-      this.savePreference(UPLOAD_VERIFY_SETTING, verifyAfterUpload),
-      this.savePreference(SHOW_ALL_FILES_SETTING, sketchbookShowAllFiles),
-      this.configService.setConfiguration(config),
-    ]);
+    await this.savePreference('editor.fontSize', editorFontSize);
+    await this.savePreference('workbench.colorTheme', themeId);
+    await this.savePreference(AUTO_SAVE_SETTING, autoSave);
+    await this.savePreference('editor.quickSuggestions', quickSuggestions);
+    await this.savePreference(AUTO_SCALE_SETTING, autoScaleInterface);
+    await this.savePreference(ZOOM_LEVEL_SETTING, interfaceScale);
+    await this.savePreference(ZOOM_LEVEL_SETTING, interfaceScale);
+    await this.savePreference(COMPILE_VERBOSE_SETTING, verboseOnCompile);
+    await this.savePreference(COMPILE_WARNINGS_SETTING, compilerWarnings);
+    await this.savePreference(UPLOAD_VERBOSE_SETTING, verboseOnUpload);
+    await this.savePreference(UPLOAD_VERIFY_SETTING, verifyAfterUpload);
+    await this.savePreference(SHOW_ALL_FILES_SETTING, sketchbookShowAllFiles);
+    await this.configService.setConfiguration(config);
     this.onDidChangeEmitter.fire(this._settings);
 
     // after saving all the settings, if we need to change the language we need to perform a reload

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

@@ -16,9 +16,9 @@ export const UserFieldsComponent = ({
   const [boardUserFields, setBoardUserFields] = React.useState<
     BoardUserField[]
   >(initialBoardUserFields);
+
   const [uploadButtonDisabled, setUploadButtonDisabled] =
     React.useState<boolean>(true);
-  const firstInputElement = React.useRef<HTMLInputElement>(null);
 
   React.useEffect(() => {
     setBoardUserFields(initialBoardUserFields);
@@ -48,10 +48,7 @@ export const UserFieldsComponent = ({
   React.useEffect(() => {
     updateUserFields(boardUserFields);
     setUploadButtonDisabled(!allFieldsHaveValues(boardUserFields));
-    if (firstInputElement.current) {
-      firstInputElement.current.focus();
-    }
-  }, [boardUserFields, updateUserFields]);
+  }, [boardUserFields]);
 
   return (
     <div>
@@ -74,7 +71,6 @@ export const UserFieldsComponent = ({
                       field.label
                     )}
                     onChange={updateUserField(index)}
-                    ref={index === 0 ? firstInputElement : undefined}
                   />
                 </div>
               </div>

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

@@ -1,18 +1,63 @@
 import * as React from '@theia/core/shared/react';
 import { inject, injectable } from '@theia/core/shared/inversify';
-import { DialogProps } from '@theia/core/lib/browser/dialogs';
+import {
+  AbstractDialog,
+  DialogProps,
+  ReactWidget,
+} from '@theia/core/lib/browser';
+import { Widget } from '@theia/core/shared/@phosphor/widgets';
 import { Message } from '@theia/core/shared/@phosphor/messaging';
 import { UploadSketch } from '../../contributions/upload-sketch';
 import { UserFieldsComponent } from './user-fields-component';
 import { BoardUserField } from '../../../common/protocol';
-import { ReactDialog } from '../../theia/dialogs/dialogs';
+
+@injectable()
+export class UserFieldsDialogWidget extends ReactWidget {
+  protected _currentUserFields: BoardUserField[] = [];
+
+  constructor(private cancel: () => void, private accept: () => Promise<void>) {
+    super();
+  }
+
+  set currentUserFields(userFields: BoardUserField[]) {
+    this.setUserFields(userFields);
+  }
+
+  get currentUserFields(): BoardUserField[] {
+    return this._currentUserFields;
+  }
+
+  resetUserFieldsValue(): void {
+    this._currentUserFields = this._currentUserFields.map((field) => {
+      field.value = '';
+      return field;
+    });
+  }
+
+  protected setUserFields(userFields: BoardUserField[]): void {
+    this._currentUserFields = userFields;
+  }
+
+  protected render(): React.ReactNode {
+    return (
+      <form>
+        <UserFieldsComponent
+          initialBoardUserFields={this._currentUserFields}
+          updateUserFields={this.setUserFields.bind(this)}
+          cancel={this.cancel}
+          accept={this.accept}
+        />
+      </form>
+    );
+  }
+}
 
 @injectable()
 export class UserFieldsDialogProps extends DialogProps {}
 
 @injectable()
-export class UserFieldsDialog extends ReactDialog<BoardUserField[]> {
-  private _currentUserFields: BoardUserField[] = [];
+export class UserFieldsDialog extends AbstractDialog<BoardUserField[]> {
+  protected readonly widget: UserFieldsDialogWidget;
 
   constructor(
     @inject(UserFieldsDialogProps)
@@ -24,36 +69,39 @@ export class UserFieldsDialog extends ReactDialog<BoardUserField[]> {
     this.titleNode.classList.add('user-fields-dialog-title');
     this.contentNode.classList.add('user-fields-dialog-content');
     this.acceptButton = undefined;
-  }
-
-  get value(): BoardUserField[] {
-    return this._currentUserFields;
-  }
-
-  set value(userFields: BoardUserField[]) {
-    this._currentUserFields = userFields;
-  }
-
-  protected override render(): React.ReactNode {
-    return (
-      <div>
-        <form>
-          <UserFieldsComponent
-            initialBoardUserFields={this.value}
-            updateUserFields={this.doUpdateUserFields}
-            cancel={this.doCancel}
-            accept={this.doAccept}
-          />
-        </form>
-      </div>
+    this.widget = new UserFieldsDialogWidget(
+      this.close.bind(this),
+      this.accept.bind(this)
     );
   }
 
+  set value(userFields: BoardUserField[]) {
+    this.widget.currentUserFields = userFields;
+  }
+
+  get value(): BoardUserField[] {
+    return this.widget.currentUserFields;
+  }
+
   protected override onAfterAttach(msg: Message): void {
+    if (this.widget.isAttached) {
+      Widget.detach(this.widget);
+    }
+    Widget.attach(this.widget, this.contentNode);
     super.onAfterAttach(msg);
     this.update();
   }
 
+  protected override onUpdateRequest(msg: Message): void {
+    super.onUpdateRequest(msg);
+    this.widget.update();
+  }
+
+  protected override onActivateRequest(msg: Message): void {
+    super.onActivateRequest(msg);
+    this.widget.activate();
+  }
+
   protected override async accept(): Promise<void> {
     // If the user presses enter and at least
     // a field is empty don't accept the input
@@ -66,21 +114,8 @@ export class UserFieldsDialog extends ReactDialog<BoardUserField[]> {
   }
 
   override close(): void {
-    this.resetUserFieldsValue();
+    this.widget.resetUserFieldsValue();
+    this.widget.close();
     super.close();
   }
-
-  private resetUserFieldsValue(): void {
-    this.value = this.value.map((field) => {
-      field.value = '';
-      return field;
-    });
-  }
-
-  private readonly doCancel: () => void = () => this.close();
-  private readonly doAccept: () => Promise<void> = () => this.accept();
-  private readonly doUpdateUserFields: (userFields: BoardUserField[]) => void =
-    (userFields: BoardUserField[]) => {
-      this.value = userFields;
-    };
 }

arduino-ide-extension/src/browser/icons/arduino-cloud-filled-offline.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13.355 3.85509L2.85504 14.3551C2.76026 14.448 2.63281 14.5001 2.50006 14.5001C2.36731 14.5001 2.23986 14.448 2.14508 14.3551C2.0514 14.2607 1.99882 14.1331 1.99882 14.0001C1.99882 13.8671 2.0514 13.7395 2.14508 13.6451L3.82508 11.9651C3.24351 11.8742 2.70645 11.5991 2.29291 11.1802C1.87936 10.7613 1.61116 10.2208 1.52775 9.63811C1.44434 9.05543 1.55012 8.46136 1.82955 7.94328C2.10897 7.4252 2.54728 7.01047 3.08 6.76009C3.20492 6.18251 3.47405 5.64596 3.86232 5.20047C4.25058 4.75498 4.74532 4.41505 5.30042 4.21239C5.85552 4.00972 6.45289 3.9509 7.03686 4.04143C7.62082 4.13196 8.17236 4.36887 8.64004 4.73009C9.01346 4.56809 9.41786 4.48995 9.82475 4.50117C10.2316 4.51239 10.6311 4.6127 10.995 4.79503L12.645 3.14509C12.7392 3.05094 12.8669 2.99805 13 2.99805C13.1332 2.99805 13.2609 3.05094 13.355 3.14509C13.4492 3.23924 13.5021 3.36694 13.5021 3.50009C13.5021 3.63324 13.4492 3.76094 13.355 3.85509V3.85509Z" fill="#7F8C8D"/>
-<path d="M14.5 9.25047C14.4987 9.97942 14.2086 10.6782 13.6931 11.1936C13.1777 11.709 12.479 11.9992 11.75 12.0005H6.70996L12.355 6.35547C12.38 6.43042 12.4 6.50547 12.4201 6.58044C13.0153 6.72902 13.5436 7.07272 13.9206 7.55669C14.2976 8.04066 14.5016 8.63699 14.5 9.25047V9.25047Z" fill="#7F8C8D"/>
-</svg>

arduino-ide-extension/src/browser/icons/arduino-cloud-filled.svg

@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.5 9.24997C14.4987 9.97893 14.2086 10.6777 13.6932 11.1931C13.1777 11.7086 12.479 11.9987 11.75 12H4.25003C3.62476 11.9998 3.01822 11.7866 2.53034 11.3955C2.04247 11.0045 1.70238 10.4589 1.56612 9.84864C1.42986 9.2384 1.50556 8.59995 1.78074 8.0385C2.05593 7.47705 2.51418 7.0261 3.07998 6.75997C3.2049 6.18239 3.47404 5.64584 3.8623 5.20035C4.25056 4.75486 4.74531 4.41494 5.3004 4.21227C5.8555 4.0096 6.45288 3.95078 7.03684 4.04131C7.62081 4.13184 8.17234 4.36875 8.64003 4.72997C8.99025 4.57772 9.36814 4.49942 9.75003 4.49997C10.3635 4.49838 10.9598 4.70238 11.4438 5.07939C11.9278 5.45641 12.2715 5.9847 12.4201 6.57993C13.0153 6.7285 13.5436 7.07221 13.9206 7.55618C14.2976 8.04015 14.5016 8.63649 14.5 9.24997Z" fill="#7F8C8D"/>
-</svg>

arduino-ide-extension/src/browser/icons/arduino-cloud-offline.svg

@@ -1,4 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.42 6.58044C12.4 6.50549 12.38 6.43042 12.355 6.35547L11.525 7.18555C11.5575 7.27223 11.6136 7.34811 11.6869 7.40464C11.7603 7.46117 11.8479 7.4961 11.94 7.50549C12.3852 7.55476 12.7947 7.77259 13.0843 8.11428C13.374 8.45597 13.5218 8.89557 13.4975 9.34284C13.4732 9.7901 13.2785 10.2111 12.9536 10.5194C12.6286 10.8276 12.1979 10.9998 11.75 11.0005H7.70996L6.70996 12.0005H11.75C12.421 12.0001 13.0688 11.7545 13.5714 11.3099C14.074 10.8653 14.3969 10.2524 14.4792 9.58644C14.5615 8.92048 14.3977 8.24739 14.0184 7.69379C13.6392 7.14019 13.0708 6.74425 12.42 6.58044V6.58044Z" fill="#7F8C8D"/>
-<path d="M13.355 3.14532C13.2606 3.05161 13.133 2.99902 13 2.99902C12.867 2.99902 12.7394 3.05161 12.6451 3.14532L10.995 4.79524C10.6311 4.61291 10.2316 4.5126 9.82472 4.50139C9.41783 4.49017 9.01343 4.56832 8.64002 4.73032C8.17233 4.3691 7.6208 4.13219 7.03684 4.04166C6.45287 3.95114 5.85549 4.00995 5.3004 4.21262C4.7453 4.41529 4.25056 4.75521 3.86229 5.2007C3.47403 5.64619 3.2049 6.18274 3.07997 6.76033C2.54726 7.01071 2.10896 7.42543 1.82954 7.9435C1.55013 8.46157 1.44434 9.05564 1.52775 9.63832C1.61115 10.221 1.87935 10.7615 2.29288 11.1804C2.70641 11.5993 3.24346 11.8744 3.82502 11.9653L2.14502 13.6453C2.05133 13.7397 1.99876 13.8673 1.99876 14.0003C1.99876 14.1333 2.05133 14.2609 2.14502 14.3553C2.23979 14.4482 2.36725 14.5003 2.5 14.5003C2.63275 14.5003 2.7602 14.4482 2.85498 14.3553L13.355 3.85528C13.4487 3.7609 13.5012 3.6333 13.5013 3.50031C13.5013 3.36732 13.4487 3.23972 13.355 3.14532V3.14532ZM4.79006 11.0003H4.25002C3.8356 11.0005 3.43458 10.8535 3.11841 10.5856C2.80224 10.3177 2.59145 9.94623 2.52362 9.5374C2.45578 9.12857 2.53529 8.70893 2.74799 8.35326C2.96069 7.99758 3.29275 7.72898 3.68502 7.59529C3.77434 7.56478 3.85319 7.50962 3.91248 7.43617C3.97176 7.36272 4.00904 7.274 4.02002 7.18025C4.09848 6.57783 4.39334 6.0245 4.84963 5.62341C5.30592 5.22233 5.89251 5.00087 6.50002 5.00032C7.1425 4.99652 7.76054 5.24628 8.21999 5.69539C8.30086 5.77275 8.40511 5.8211 8.5164 5.83285C8.6277 5.8446 8.73974 5.8191 8.83499 5.76033C9.10926 5.58886 9.42655 5.4987 9.75002 5.50032C9.9105 5.50127 10.0702 5.5231 10.225 5.56526L4.79006 11.0003Z" fill="#7F8C8D"/>
-</svg>