@theia/core 1.46.0-next.200 → 1.46.0-next.230

package/src/common/preferences/preference-schema.ts

@@ -75,6 +75,7 @@ export interface PreferenceSchemaProperty extends PreferenceItem {
     description?: string;
     markdownDescription?: string;
     scope?: 'application' | 'machine' | 'window' | 'resource' | 'language-overridable' | 'machine-overridable' | PreferenceScope;
+    tags?: string[];
 }
 
 export interface PreferenceDataProperty extends PreferenceItem {

package/src/common/selection-command-handler.ts

@@ -18,7 +18,7 @@
 import { CommandHandler } from './command';
 import { SelectionService } from '../common/selection-service';
 
-export class SelectionCommandHandler<S> implements CommandHandler {
+export class SelectionCommandHandler<S extends Object> implements CommandHandler {
 
     constructor(
         protected readonly selectionService: SelectionService,

package/src/electron-browser/window/electron-window-preferences.ts

@@ -38,7 +38,7 @@ export const electronWindowPreferencesSchema: PreferenceSchema = {
             'maximum': ZoomLevel.MAX,
             'scope': 'application',
             // eslint-disable-next-line max-len
-            'description': nls.localizeByDefault('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.')
+            'description': nls.localizeByDefault("Adjust the default zoom level for all windows. Each increment above `0` (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. See {0} for configuring if the 'Zoom In' and 'Zoom Out' commands apply the zoom level to all windows or only the active window.")
         },
         'window.titleBarStyle': {
             type: 'string',

package/src/electron-main/electron-main-application.ts

@@ -209,6 +209,7 @@ export class ElectronMainApplication {
     async start(config: FrontendApplicationConfig): Promise<void> {
         const argv = this.processArgv.getProcessArgvWithoutBin(process.argv);
         createYargs(argv, process.cwd())
+            .help(false)
             .command('$0 [file]', false,
                 cmd => cmd
                     .option('electronUserData', {

package/src/electron-node/cli/electron-backend-cli-module.ts

@@ -0,0 +1,24 @@
+// *****************************************************************************
+// Copyright (C) 2024 STMicroelectronics and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { ContainerModule } from 'inversify';
+import { ElectronCliContribution } from './electron-cli-contribution';
+import { CliContribution } from '../../node';
+
+export default new ContainerModule(bind => {
+    bind(ElectronCliContribution).toSelf().inSingletonScope();
+    bind(CliContribution).toService(ElectronCliContribution);
+});

package/src/electron-node/cli/electron-cli-contribution.ts

@@ -0,0 +1,35 @@
+/********************************************************************************
+ * Copyright (C) 2024 STMicroelectronics and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+import { injectable } from 'inversify';
+import { Argv, Arguments } from 'yargs';
+import { CliContribution } from '../../node';
+import { MaybePromise } from '../../common';
+
+@injectable()
+export class ElectronCliContribution implements CliContribution {
+
+    configure(conf: Argv): void {
+        conf.option('electronUserData', {
+            type: 'string',
+            describe: 'The area where the electron main process puts its data'
+        });
+    }
+
+    setArguments(args: Arguments): MaybePromise<void> {
+    }
+
+}

package/src/node/cli.ts

@@ -38,7 +38,7 @@ export class CliManager {
     async initializeCli<T>(argv: string[], postSetArguments: () => Promise<void>, defaultCommand: () => Promise<void>): Promise<void> {
         const pack = require('../../package.json');
         const version = pack.version;
-        const command = yargs.version(version);
+        const command = yargs(argv, process.cwd()).version(version);
         command.exitProcess(this.isExit());
         for (const contrib of this.contributionsProvider.getContributions()) {
             contrib.configure(command);
@@ -54,7 +54,7 @@ export class CliManager {
                 await postSetArguments();
             })
             .command('$0', false, () => { }, defaultCommand)
-            .parse(argv);
+            .parse();
     }
 
     protected isExit(): boolean {

package/lib/browser/save-resource-service.d.ts

@@ -1,36 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2022 Arm and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
- ********************************************************************************/
-import { MessageService, URI } from '../common';
-import { Navigatable } from './navigatable-types';
-import { Saveable, SaveableSource, SaveOptions } from './saveable';
-import { Widget } from './widgets';
-export declare class SaveResourceService {
-    protected readonly messageService: MessageService;
-    /**
-     * Indicate if the document can be saved ('Save' command should be disable if not).
-     */
-    canSave(widget?: Widget): widget is Widget & (Saveable | SaveableSource);
-    canSaveNotSaveAs(widget?: Widget): widget is Widget & (Saveable | SaveableSource);
-    /**
-     * Saves the document
-     *
-     * No op if the widget is not saveable.
-     */
-    save(widget: Widget | undefined, options?: SaveOptions): Promise<URI | undefined>;
-    canSaveAs(saveable?: Widget): saveable is Widget & SaveableSource & Navigatable;
-    saveAs(sourceWidget: Widget & SaveableSource & Navigatable, options?: SaveOptions): Promise<URI | undefined>;
-}
-//# sourceMappingURL=save-resource-service.d.ts.map

package/lib/browser/save-resource-service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"save-resource-service.d.ts","sourceRoot":"","sources":["../../src/browser/save-resource-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAGlF,OAAO,EAAE,cAAc,EAAmB,GAAG,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EAAE,WAAW,EAAqB,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAEnC,qBACa,mBAAmB;IACJ,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAE1E;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,IAAI,MAAM,GAAG,CAAC,QAAQ,GAAG,cAAc,CAAC;IAIxE,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,IAAI,MAAM,GAAG,CAAC,QAAQ,GAAG,cAAc,CAAC;IAKjF;;;;OAIG;IACG,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;IASvF,SAAS,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,IAAI,MAAM,GAAG,cAAc,GAAG,WAAW;IAI/E,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc,GAAG,WAAW,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC;CAG/G"}

package/lib/browser/save-resource-service.js

@@ -1,65 +0,0 @@
-"use strict";
-/********************************************************************************
- * Copyright (C) 2022 Arm and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
- ********************************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SaveResourceService = void 0;
-const tslib_1 = require("tslib");
-const inversify_1 = require("inversify");
-const common_1 = require("../common");
-const navigatable_types_1 = require("./navigatable-types");
-const saveable_1 = require("./saveable");
-let SaveResourceService = class SaveResourceService {
-    /**
-     * Indicate if the document can be saved ('Save' command should be disable if not).
-     */
-    canSave(widget) {
-        return saveable_1.Saveable.isDirty(widget) && (this.canSaveNotSaveAs(widget) || this.canSaveAs(widget));
-    }
-    canSaveNotSaveAs(widget) {
-        var _a;
-        // By default, we never allow a document to be saved if it is untitled.
-        return Boolean(widget && ((_a = navigatable_types_1.NavigatableWidget.getUri(widget)) === null || _a === void 0 ? void 0 : _a.scheme) !== common_1.UNTITLED_SCHEME);
-    }
-    /**
-     * Saves the document
-     *
-     * No op if the widget is not saveable.
-     */
-    async save(widget, options) {
-        if (this.canSaveNotSaveAs(widget)) {
-            await saveable_1.Saveable.save(widget, options);
-            return navigatable_types_1.NavigatableWidget.getUri(widget);
-        }
-        else if (this.canSaveAs(widget)) {
-            return this.saveAs(widget, options);
-        }
-    }
-    canSaveAs(saveable) {
-        return false;
-    }
-    saveAs(sourceWidget, options) {
-        return Promise.reject('Unsupported: The base SaveResourceService does not support saveAs action.');
-    }
-};
-(0, tslib_1.__decorate)([
-    (0, inversify_1.inject)(common_1.MessageService),
-    (0, tslib_1.__metadata)("design:type", common_1.MessageService)
-], SaveResourceService.prototype, "messageService", void 0);
-SaveResourceService = (0, tslib_1.__decorate)([
-    (0, inversify_1.injectable)()
-], SaveResourceService);
-exports.SaveResourceService = SaveResourceService;
-//# sourceMappingURL=save-resource-service.js.map

package/lib/browser/save-resource-service.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"save-resource-service.js","sourceRoot":"","sources":["../../src/browser/save-resource-service.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;AAElF,yCAA+C;AAC/C,sCAAiE;AACjE,2DAAqE;AACrE,yCAAmE;AAInE,IAAa,mBAAmB,GAAhC,MAAa,mBAAmB;IAG5B;;OAEG;IACH,OAAO,CAAC,MAAe;QACnB,OAAO,mBAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IACjG,CAAC;IAED,gBAAgB,CAAC,MAAe;;QAC5B,uEAAuE;QACvE,OAAO,OAAO,CAAC,MAAM,IAAI,CAAA,MAAA,qCAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,0CAAE,MAAM,MAAK,wBAAe,CAAC,CAAC;IAC3F,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,IAAI,CAAC,MAA0B,EAAE,OAAqB;QACxD,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,mBAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACrC,OAAO,qCAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SAC3C;aAAM,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;YAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SACvC;IACL,CAAC;IAED,SAAS,CAAC,QAAiB;QACvB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,YAAmD,EAAE,OAAqB;QAC7E,OAAO,OAAO,CAAC,MAAM,CAAC,2EAA2E,CAAC,CAAC;IACvG,CAAC;CACJ,CAAA;AAnC2B;IAAvB,IAAA,kBAAM,EAAC,uBAAc,CAAC;2CAAoC,uBAAc;2DAAC;AADjE,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;GACA,mBAAmB,CAoC/B;AApCY,kDAAmB"}

package/src/browser/save-resource-service.ts

@@ -1,60 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2022 Arm and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
- ********************************************************************************/
-
-import { inject, injectable } from 'inversify';
-import { MessageService, UNTITLED_SCHEME, URI } from '../common';
-import { Navigatable, NavigatableWidget } from './navigatable-types';
-import { Saveable, SaveableSource, SaveOptions } from './saveable';
-import { Widget } from './widgets';
-
-@injectable()
-export class SaveResourceService {
-    @inject(MessageService) protected readonly messageService: MessageService;
-
-    /**
-     * Indicate if the document can be saved ('Save' command should be disable if not).
-     */
-    canSave(widget?: Widget): widget is Widget & (Saveable | SaveableSource) {
-        return Saveable.isDirty(widget) && (this.canSaveNotSaveAs(widget) || this.canSaveAs(widget));
-    }
-
-    canSaveNotSaveAs(widget?: Widget): widget is Widget & (Saveable | SaveableSource) {
-        // By default, we never allow a document to be saved if it is untitled.
-        return Boolean(widget && NavigatableWidget.getUri(widget)?.scheme !== UNTITLED_SCHEME);
-    }
-
-    /**
-     * Saves the document
-     *
-     * No op if the widget is not saveable.
-     */
-    async save(widget: Widget | undefined, options?: SaveOptions): Promise<URI | undefined> {
-        if (this.canSaveNotSaveAs(widget)) {
-            await Saveable.save(widget, options);
-            return NavigatableWidget.getUri(widget);
-        } else if (this.canSaveAs(widget)) {
-            return this.saveAs(widget, options);
-        }
-    }
-
-    canSaveAs(saveable?: Widget): saveable is Widget & SaveableSource & Navigatable {
-        return false;
-    }
-
-    saveAs(sourceWidget: Widget & SaveableSource & Navigatable, options?: SaveOptions): Promise<URI | undefined> {
-        return Promise.reject('Unsupported: The base SaveResourceService does not support saveAs action.');
-    }
-}