removed open prompt

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

Author: Akos Kitta

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

@@ -40,35 +40,6 @@ export namespace ErrorRevealStrategy {
   export const Default: ErrorRevealStrategy = 'centerIfOutsideViewport';
 }
 
-export const CloudSketchOpenStrategyLiterals = [
-  'Ask',
-  'Never',
-  'Always',
-] as const;
-export type CloudSketchOpenStrategy =
-  typeof CloudSketchOpenStrategyLiterals[number];
-export namespace CloudSketchOpenStrategy {
-  export const Default: CloudSketchOpenStrategy = 'Ask';
-  export function labelOf(strategy: CloudSketchOpenStrategy): string {
-    return CloudSketchOpenStrategyLabels[strategy];
-  }
-  const CloudSketchOpenStrategyLabels: Record<CloudSketchOpenStrategy, string> =
-    {
-      Ask: nls.localize(
-        'arduino/preferences/cloud.sketchOpenStrategy.ask',
-        'Ask'
-      ),
-      Never: nls.localize(
-        'arduino/preferences/cloud.sketchOpenStrategy.never',
-        'Never'
-      ),
-      Always: nls.localize(
-        'arduino/preferences/cloud.sketchOpenStrategy.always',
-        'Always'
-      ),
-    };
-}
-
 export const ArduinoConfigSchema: PreferenceSchema = {
   type: 'object',
   properties: {
@@ -190,29 +161,6 @@ export const ArduinoConfigSchema: PreferenceSchema = {
       ),
       default: true,
     },
-    'arduino.cloud.sketchOpenStrategy': {
-      enum: [...CloudSketchOpenStrategyLiterals],
-      enumDescriptions: [
-        nls.localize(
-          'arduino/preferences/cloud.sketchOpenStrategy.ask.description',
-          'IDE asks users whether to pull the remote sketch and open it in a new window.'
-        ),
-        nls.localize(
-          'arduino/preferences/cloud.sketchOpenStrategy.never.description',
-          'IDE neither pulls nor opens the remote sketch after creating it. Users can manually pull the remote sketch.'
-        ),
-        nls.localize(
-          'arduino/preferences/cloud.sketchOpenStrategy.always.description',
-          'IDE automatically pulls and opens the remote sketch in a new window.'
-        ),
-      ],
-      markdownDescription: nls.localize(
-        'arduino/preferences/cloud.sketchOpenStrategy',
-        'Configures what IDE does after creating a new remote sketch. The default value is `"{0}"`.',
-        CloudSketchOpenStrategy.labelOf('Ask')
-      ),
-      default: CloudSketchOpenStrategy.Default,
-    },
     'arduino.cloud.pull.warn': {
       type: 'boolean',
       description: nls.localize(
@@ -328,7 +276,6 @@ export interface ArduinoConfiguration {
   'arduino.board.certificates': string;
   'arduino.sketchbook.showAllFiles': boolean;
   'arduino.cloud.enabled': boolean;
-  'arduino.cloud.sketchOpenStrategy': CloudSketchOpenStrategy;
   'arduino.cloud.pull.warn': boolean;
   'arduino.cloud.push.warn': boolean;
   'arduino.cloud.pushpublic.warn': boolean;

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

@@ -1,15 +1,10 @@
 import { MenuModelRegistry } from '@theia/core';
-import {
-  PreferenceScope,
-  PreferenceService,
-} from '@theia/core/lib/browser/preferences/preference-service';
 import { CompositeTreeNode } from '@theia/core/lib/browser/tree';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import { nls } from '@theia/core/lib/common/nls';
 import { inject, injectable } from '@theia/core/shared/inversify';
 import { MainMenuManager } from '../../common/main-menu-manager';
 import type { AuthenticationSession } from '../../node/auth/types';
-import { CloudSketchOpenStrategy } from '../arduino-preferences';
 import { AuthenticationClientService } from '../auth/authentication-client-service';
 import { CreateApi } from '../create/create-api';
 import { CreateUri } from '../create/create-uri';
@@ -34,13 +29,10 @@ export class NewCloudSketch extends Contribution {
   private readonly authenticationService: AuthenticationClientService;
   @inject(MainMenuManager)
   private readonly mainMenuManager: MainMenuManager;
-  @inject(PreferenceService)
-  private readonly preferenceService: PreferenceService;
 
   private readonly toDispose = new DisposableCollection();
   private _session: AuthenticationSession | undefined;
   private _enabled: boolean;
-  private _strategy: CloudSketchOpenStrategy;
 
   override onReady(): void {
     this.toDispose.pushAll([
@@ -52,23 +44,15 @@ export class NewCloudSketch extends Contribution {
         }
       }),
       this.preferences.onPreferenceChanged(({ preferenceName, newValue }) => {
-        switch (preferenceName) {
-          case 'arduino.cloud.sketchOpenStrategy': {
-            this._strategy = newValue as CloudSketchOpenStrategy;
-            break;
-          }
-          case 'arduino.cloud.enabled': {
-            const oldEnabled = this._enabled;
-            this._enabled = Boolean(newValue);
-            if (this._enabled !== oldEnabled) {
-              this.mainMenuManager.update();
-            }
-            break;
+        if (preferenceName === 'arduino.cloud.enabled') {
+          const oldEnabled = this._enabled;
+          this._enabled = Boolean(newValue);
+          if (this._enabled !== oldEnabled) {
+            this.mainMenuManager.update();
           }
         }
       }),
     ]);
-    this._strategy = this.preferences['arduino.cloud.sketchOpenStrategy'];
     this._enabled = this.preferences['arduino.cloud.enabled'];
     this._session = this.authenticationService.session;
     if (this._session) {
@@ -136,77 +120,48 @@ export class NewCloudSketch extends Contribution {
     }
 
     if (result) {
-      return this.maybeOpen(treeModel, result);
+      return this.open(treeModel, result);
     }
     return undefined;
   }
 
-  private async maybeOpen(
+  private async open(
     treeModel: CloudSketchbookTreeModel,
     newSketch: Create.Sketch
   ): Promise<URI | undefined> {
-    if (this._strategy === 'Never') {
-      return undefined;
+    const id = CreateUri.toUri(newSketch).path.toString();
+    const node = treeModel.getNode(id);
+    if (!node) {
+      throw new Error(
+        `Could not find remote sketchbook tree node with Tree node ID: ${id}.`
+      );
     }
-    if (this._strategy === 'Ask') {
-      const yes = nls.localize('vscode/extensionsUtils/yes', 'Yes');
-      const never = CloudSketchOpenStrategy.labelOf('Never');
-      const always = CloudSketchOpenStrategy.labelOf('Always');
-      const answer = await this.messageService.info(
-        nls.localize(
-          'arduino/newCloudSketch/openNewSketch',
-          "Do you want to pull the new remote sketch '{0}' and open it in a new window?",
-          newSketch.name
-        ),
-        never,
-        yes,
-        always
+    if (!CloudSketchbookTree.CloudSketchDirNode.is(node)) {
+      throw new Error(
+        `Remote sketchbook tree node expected to represent a directory but it did not. Tree node ID: ${id}.`
       );
-      if (!answer) {
-        return undefined;
-      }
-      if (answer === never) {
-        await this.preferenceService.set(
-          'arduino.cloud.sketchOpenStrategy',
-          'Never',
-          PreferenceScope.User
+    }
+    try {
+      await treeModel.sketchbookTree().pull({ node });
+    } catch (err) {
+      if (isNotFound(err)) {
+        await treeModel.updateRoot();
+        await treeModel.refresh();
+        this.messageService.error(
+          nls.localize(
+            'arduino/newCloudSketch/notFound',
+            "Could not pull the remote sketch '{0}'. It does not exist.",
+            newSketch.name
+          )
         );
         return undefined;
-      } else if (answer === always) {
-        await this.preferenceService.set(
-          'arduino.cloud.sketchOpenStrategy',
-          'Always',
-          PreferenceScope.User
-        );
       }
+      throw err;
     }
-    const node = treeModel.getNode(CreateUri.toUri(newSketch).path.toString());
-    if (!node) {
-      return undefined;
-    }
-    if (CloudSketchbookTree.CloudSketchDirNode.is(node)) {
-      try {
-        await treeModel.sketchbookTree().pull({ node });
-      } catch (err) {
-        if (isNotFound(err)) {
-          await treeModel.updateRoot();
-          await treeModel.refresh();
-          this.messageService.error(
-            nls.localize(
-              'arduino/newCloudSketch/notFound',
-              "Could not pull the remote sketch '{0}'. It does not exist.",
-              newSketch.name
-            )
-          );
-          return undefined;
-        }
-        throw err;
-      }
-      return this.commandService.executeCommand(
-        SketchbookCommands.OPEN_NEW_WINDOW.id,
-        { node }
-      );
-    }
+    return this.commandService.executeCommand(
+      SketchbookCommands.OPEN_NEW_WINDOW.id,
+      { node }
+    );
   }
 
   private treeModelFrom(