Merge branch 'main' into theia-1.37.0-next

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

Author: Akos Kitta

Diff for: arduino-ide-extension/src/browser/create/create-features.ts

@@ -8,6 +8,10 @@ import { AuthenticationSession } from '../../common/protocol/authentication-serv
 import { ArduinoPreferences } from '../arduino-preferences';
 import { AuthenticationClientService } from '../auth/authentication-client-service';
 import { LocalCacheFsProvider } from '../local-cache/local-cache-fs-provider';
+import {
+  ARDUINO_CLOUD_FOLDER,
+  REMOTE_SKETCHBOOK_FOLDER,
+} from '../utils/constants';
 import { CreateUri } from './create-uri';
 
 export type CloudSketchState = 'push' | 'pull';
@@ -128,8 +132,8 @@ export class CreateFeatures implements FrontendApplicationContribution {
       return undefined;
     }
     return dataDirUri
-      .resolve('RemoteSketchbook')
-      .resolve('ArduinoCloud')
+      .resolve(REMOTE_SKETCHBOOK_FOLDER)
+      .resolve(ARDUINO_CLOUD_FOLDER)
       .isEqualOrParent(new URI(sketch.uri));
   }
 

Diff for: arduino-ide-extension/src/browser/local-cache/local-cache-fs-provider.ts

@@ -16,6 +16,10 @@ import {
 import { AuthenticationClientService } from '../auth/authentication-client-service';
 import { AuthenticationSession } from '../../common/protocol/authentication-service';
 import { ConfigService } from '../../common/protocol';
+import {
+  ARDUINO_CLOUD_FOLDER,
+  REMOTE_SKETCHBOOK_FOLDER,
+} from '../utils/constants';
 
 export namespace LocalCacheUri {
   export const scheme = 'arduino-local-cache';
@@ -107,7 +111,7 @@ export class LocalCacheFsProvider
       return;
     }
     this._localCacheRoot = localCacheUri;
-    for (const segment of ['RemoteSketchbook', 'ArduinoCloud']) {
+    for (const segment of [REMOTE_SKETCHBOOK_FOLDER, ARDUINO_CLOUD_FOLDER]) {
       this._localCacheRoot = this._localCacheRoot.resolve(segment);
       await fileService.createFolder(this._localCacheRoot);
     }

Diff for: arduino-ide-extension/src/browser/theia/markers/problem-manager.ts

@@ -9,27 +9,43 @@ import { Marker } from '@theia/markers/lib/common/marker';
 import { ProblemManager as TheiaProblemManager } from '@theia/markers/lib/browser/problem/problem-manager';
 import { ConfigServiceClient } from '../../config/config-service-client';
 import debounce from 'lodash.debounce';
+import {
+  ARDUINO_CLOUD_FOLDER,
+  REMOTE_SKETCHBOOK_FOLDER,
+} from '../../utils/constants';
 
 @injectable()
 export class ProblemManager extends TheiaProblemManager {
   @inject(ConfigServiceClient)
   private readonly configService: ConfigServiceClient;
 
   private dataDirUri: URI | undefined;
+  private cloudCacheDirUri: URI | undefined;
 
   @postConstruct()
   protected override init(): void {
     super.init();
     this.dataDirUri = this.configService.tryGetDataDirUri();
-    this.configService.onDidChangeDataDirUri((uri) => (this.dataDirUri = uri));
+    this.configService.onDidChangeDataDirUri((uri) => {
+      this.dataDirUri = uri;
+      this.cloudCacheDirUri = this.dataDirUri
+        ?.resolve(REMOTE_SKETCHBOOK_FOLDER)
+        .resolve(ARDUINO_CLOUD_FOLDER);
+    });
   }
 
   override setMarkers(
     uri: URI,
     owner: string,
     data: Diagnostic[]
   ): Marker<Diagnostic>[] {
-    if (this.dataDirUri && this.dataDirUri.isEqualOrParent(uri)) {
+    if (
+      this.dataDirUri &&
+      this.dataDirUri.isEqualOrParent(uri) &&
+      this.cloudCacheDirUri && // Do not disable the diagnostics for cloud sketches https://github.com/arduino/arduino-ide/issues/669
+      !this.cloudCacheDirUri.isEqualOrParent(uri)
+    ) {
+      // If in directories.data folder but not in the cloud sketchbook cache folder.
       return [];
     }
     return super.setMarkers(uri, owner, data);