remove custom CLI binding.

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

Author: Akos Kitta

arduino-ide-extension/src/node/arduino-ide-backend-module.ts

@@ -4,7 +4,6 @@ import {
   ArduinoFirmwareUploader,
   ArduinoFirmwareUploaderPath,
 } from '../common/protocol/arduino-firmware-uploader';
-
 import { ILogger } from '@theia/core/lib/common/logger';
 import {
   BackendApplicationContribution,
@@ -25,11 +24,7 @@ import { CoreService, CoreServicePath } from '../common/protocol/core-service';
 import { ConnectionContainerModule } from '@theia/core/lib/node/messaging/connection-container-module';
 import { CoreClientProvider } from './core-client-provider';
 import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core';
-import {
-  DefaultWorkspaceServer,
-  WorkspaceCliContribution,
-} from './theia/workspace/default-workspace-server';
-import { WorkspaceCliContribution as TheiaWorkspaceCliContribution } from '@theia/workspace/lib/node/default-workspace-server';
+import { DefaultWorkspaceServer } from './theia/workspace/default-workspace-server';
 import { WorkspaceServer as TheiaWorkspaceServer } from '@theia/workspace/lib/common/workspace-protocol';
 import { SketchesServiceImpl } from './sketches-service-impl';
 import {
@@ -44,7 +39,6 @@ import {
   ArduinoDaemon,
   ArduinoDaemonPath,
 } from '../common/protocol/arduino-daemon';
-
 import { ConfigServiceImpl } from './config-service-impl';
 import { EnvVariablesServer as TheiaEnvVariablesServer } from '@theia/core/lib/common/env-variables';
 import { EnvVariablesServer } from './theia/env-variables/env-variables-server';
@@ -231,8 +225,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
 
   bind(DefaultWorkspaceServer).toSelf().inSingletonScope();
   rebind(TheiaWorkspaceServer).toService(DefaultWorkspaceServer);
-  bind(WorkspaceCliContribution).toSelf().inSingletonScope();
-  rebind(TheiaWorkspaceCliContribution).toService(WorkspaceCliContribution);
 
   bind(EnvVariablesServer).toSelf().inSingletonScope();
   rebind(TheiaEnvVariablesServer).toService(EnvVariablesServer);

arduino-ide-extension/src/node/theia/workspace/default-workspace-server.ts

@@ -1,116 +1,9 @@
 import { promises as fs, constants } from 'fs';
 import { injectable, inject } from '@theia/core/shared/inversify';
-import {
-  DefaultWorkspaceServer as TheiaDefaultWorkspaceServer,
-  WorkspaceCliContribution as TheiaWorkspaceCliContribution,
-} from '@theia/workspace/lib/node/default-workspace-server';
+import { DefaultWorkspaceServer as TheiaDefaultWorkspaceServer } from '@theia/workspace/lib/node/default-workspace-server';
 import { SketchesService } from '../../../common/protocol';
-import { FileUri } from '@theia/core/lib/node/file-uri';
+import { FileUri } from '@theia/core/lib/node';
 import { IsTempSketch } from '../../is-temp-sketch';
-import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
-import { Deferred } from '@theia/core/lib/common/promise-util';
-import { MaybePromise } from '@theia/core/lib/common/types';
-import URI from '@theia/core/lib/common/uri';
-import * as yargs from '@theia/core/shared/yargs';
-import { THEIA_EXT } from '@theia/workspace/lib/common/utils';
-import * as fsExtra from 'fs-extra';
-import * as path from 'path';
-
-@injectable()
-export class WorkspaceCliContribution extends TheiaWorkspaceCliContribution {
-  @inject(EnvVariablesServer)
-  private readonly envVariablesServer: EnvVariablesServer;
-
-  override workspaceRoot = new Deferred<string | undefined>();
-
-  override configure(conf: yargs.Argv): void {
-    conf.usage('$0 [workspace-directories] [options]');
-    conf.option('root-dir', {
-      description: 'DEPRECATED: Sets the workspace directory.',
-    });
-  }
-
-  override async setArguments(args: yargs.Arguments): Promise<void> {
-    const workspaceArguments = args._.slice(2).map((probablyAlreadyString) =>
-      String(probablyAlreadyString)
-    );
-    if (workspaceArguments.length === 0 && args['root-dir']) {
-      workspaceArguments.push(String(args['root-dir']));
-    }
-    if (workspaceArguments.length === 0) {
-      this.workspaceRoot.resolve(undefined);
-    } else if (workspaceArguments.length === 1) {
-      this.workspaceRoot.resolve(
-        this.normalizeWorkspaceArg(workspaceArguments[0])
-      );
-    } else {
-      this.workspaceRoot.resolve(
-        await this.buildWorkspaceForMultipleArguments(workspaceArguments)
-      );
-    }
-  }
-
-  protected normalizeWorkspaceArg(raw: string): string {
-    return path.resolve(raw).replace(/\/$/, '');
-  }
-
-  protected async buildWorkspaceForMultipleArguments(
-    workspaceArguments: string[]
-  ): Promise<string | undefined> {
-    try {
-      const dirs = await Promise.all(
-        workspaceArguments.map(async (maybeDir) =>
-          (await fs.stat(maybeDir).catch(() => undefined))?.isDirectory()
-        )
-      );
-      const folders = workspaceArguments
-        .filter((_, index) => dirs[index])
-        .map((dir) => ({ path: this.normalizeWorkspaceArg(dir) }));
-      if (folders.length < 2) {
-        return folders[0]?.path;
-      }
-      const untitledWorkspaceUri = await this.getUntitledWorkspaceUri(
-        new URI(await this.envVariablesServer.getConfigDirUri()),
-        async (uri) => !(await fsExtra.pathExists(uri.path.fsPath()))
-      );
-      const untitledWorkspacePath = untitledWorkspaceUri.path.fsPath();
-
-      await fsExtra.ensureDir(path.dirname(untitledWorkspacePath));
-      await fs.writeFile(
-        untitledWorkspacePath,
-        JSON.stringify({ folders }, undefined, 4)
-      );
-      return untitledWorkspacePath;
-    } catch {
-      return undefined;
-    }
-  }
-
-  async getUntitledWorkspaceUri(
-    configDirUri: URI,
-    isAcceptable: (candidate: URI) => MaybePromise<boolean>,
-    warnOnHits?: () => unknown
-  ): Promise<URI> {
-    const parentDir = configDirUri.resolve('workspaces');
-    let uri;
-    let attempts = 0;
-    do {
-      attempts++;
-      uri = parentDir.resolve(
-        `Untitled-${Math.round(Math.random() * 1000)}.${THEIA_EXT}`
-      );
-      if (attempts === 10) {
-        warnOnHits?.();
-      }
-      if (attempts === 50) {
-        throw new Error(
-          'Workspace Service: too many attempts to find unused filename.'
-        );
-      }
-    } while (!(await isAcceptable(uri)));
-    return uri;
-  }
-}
 
 @injectable()
 export class DefaultWorkspaceServer extends TheiaDefaultWorkspaceServer {