feat: use Arduino CLI 0.36.0-rc.1 APIs

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

.github/workflows/build.yml

@@ -45,7 +45,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.21'
   # See: https://github.com/actions/setup-node/#readme
   NODE_VERSION: '18.17'
   JOB_TRANSFER_ARTIFACT: build-artifacts

.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.21'
 
 # See: https://docs.github.com/en/actions/reference/events-that-trigger-workflows
 on:

.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.21'
 
 on:
   schedule:

.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.21'
 
 on:
   schedule:

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

@@ -8,7 +8,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.21'
   NODE_VERSION: '18.17'
 
 jobs:

arduino-ide-extension/package.json

@@ -169,13 +169,17 @@
   ],
   "arduino": {
     "arduino-cli": {
-      "version": "0.35.2"
+      "version": "0.36.0-rc.1"
     },
     "arduino-fwuploader": {
       "version": "2.4.1"
     },
     "arduino-language-server": {
-      "version": "0.7.6"
+      "version": {
+        "owner": "arduino",
+        "repo": "arduino-language-server",
+        "commitish": "91c2ba8"
+      }
     },
     "clangd": {
       "version": "14.0.0"

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

@@ -3,7 +3,7 @@
 (async () => {
   const os = require('node:os');
   const path = require('node:path');
-  const { mkdirSync, promises: fs } = require('node:fs');
+  const { mkdirSync, promises: fs, rmSync } = require('node:fs');
   const { exec } = require('./utils');
   const glob = require('glob');
   const { SemVer, gte, valid: validSemVer } = require('semver');
@@ -140,6 +140,10 @@
 
   const rpc = path.join(repository, 'rpc');
   const out = path.join(__dirname, '..', 'src', 'node', 'cli-protocol');
+  // Must wipe the gen output folder. Otherwise, dangling service implementation remain in IDE2 code,
+  // although it has been removed from the proto file.
+  // For example, https://github.com/arduino/arduino-cli/commit/50a8bf5c3e61d5b661ccfcd6a055e82eeb510859.
+  rmSync(out, { recursive: true, maxRetries: 5, force: true });
   mkdirSync(out, { recursive: true });
 
   const protos = await new Promise((resolve) =>

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

@@ -196,11 +196,7 @@ export class InoLanguage extends SketchContribution {
     forceStart = false
   ): Promise<void> {
     const port = await this.daemon.tryGetPort();
-    if (!port) {
-      return;
-    }
-    const portNumber = Number.parseInt(port, 10); // TODO: IDE2 APIs should provide a number and not string
-    if (Number.isNaN(portNumber)) {
+    if (typeof port !== 'number') {
       return;
     }
     const release = await this.languageServerStartMutex.acquire();
@@ -280,7 +276,7 @@ export class InoLanguage extends SketchContribution {
           lsPath,
           daemonAddress: {
             hostname: 'localhost',
-            port: portNumber,
+            port,
             instance: 1, // TODO: get it from the backend
           },
           clangdPath,

arduino-ide-extension/src/browser/notification-center.ts

@@ -46,7 +46,7 @@ export class NotificationCenter
     new Emitter<ProgressMessage>();
   private readonly indexUpdateDidFailEmitter =
     new Emitter<IndexUpdateDidFailParams>();
-  private readonly daemonDidStartEmitter = new Emitter<string>();
+  private readonly daemonDidStartEmitter = new Emitter<number>();
   private readonly daemonDidStopEmitter = new Emitter<void>();
   private readonly configDidChangeEmitter = new Emitter<ConfigState>();
   private readonly platformDidInstallEmitter = new Emitter<{
@@ -136,7 +136,7 @@ export class NotificationCenter
     this.indexUpdateDidFailEmitter.fire(params);
   }
 
-  notifyDaemonDidStart(port: string): void {
+  notifyDaemonDidStart(port: number): void {
     this.daemonDidStartEmitter.fire(port);
   }
 

arduino-ide-extension/src/browser/theia/core/connection-status-service.ts

@@ -74,8 +74,8 @@ export class DaemonPort implements FrontendApplicationContribution {
   @inject(NotificationCenter)
   private readonly notificationCenter: NotificationCenter;
 
-  private readonly onPortDidChangeEmitter = new Emitter<string | undefined>();
-  private _port: string | undefined;
+  private readonly onPortDidChangeEmitter = new Emitter<number | undefined>();
+  private _port: number | undefined;
 
   onStart(): void {
     this.daemon.tryGetPort().then(
@@ -91,15 +91,15 @@ export class DaemonPort implements FrontendApplicationContribution {
     this.onPortDidChangeEmitter.dispose();
   }
 
-  get port(): string | undefined {
+  get port(): number | undefined {
     return this._port;
   }
 
-  get onDidChangePort(): Event<string | undefined> {
+  get onDidChangePort(): Event<number | undefined> {
     return this.onPortDidChangeEmitter.event;
   }
 
-  private setPort(port: string | undefined): void {
+  private setPort(port: number | undefined): void {
     const oldPort = this._port;
     this._port = port;
     if (this._port !== oldPort) {