@theia/workspace 1.77.0-next.0 → 1.77.0-next.101
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/canonical-uri-service.js +12 -16
- package/lib/browser/canonical-uri-service.js.map +1 -1
- package/lib/browser/diff-service.js +23 -29
- package/lib/browser/diff-service.js.map +1 -1
- package/lib/browser/index.d.ts +8 -8
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +8 -11
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/metadata-storage/index.d.ts +2 -2
- package/lib/browser/metadata-storage/index.d.ts.map +1 -1
- package/lib/browser/metadata-storage/index.js +2 -9
- package/lib/browser/metadata-storage/index.js.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.d.ts +6 -2
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.d.ts.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.js +34 -36
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.js.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.spec.js +70 -73
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.spec.js.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-store.d.ts +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-store.d.ts.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-store.js +19 -28
- package/lib/browser/metadata-storage/workspace-metadata-store.js.map +1 -1
- package/lib/browser/quick-open-workspace.d.ts +2 -2
- package/lib/browser/quick-open-workspace.d.ts.map +1 -1
- package/lib/browser/quick-open-workspace.js +31 -40
- package/lib/browser/quick-open-workspace.js.map +1 -1
- package/lib/browser/test/with-workspace-service-defaults.d.ts +8 -0
- package/lib/browser/test/with-workspace-service-defaults.d.ts.map +1 -0
- package/lib/browser/test/with-workspace-service-defaults.js +25 -0
- package/lib/browser/test/with-workspace-service-defaults.js.map +1 -0
- package/lib/browser/untitled-workspace-exit-dialog.js +13 -17
- package/lib/browser/untitled-workspace-exit-dialog.js.map +1 -1
- package/lib/browser/workspace-breadcrumbs-contribution.d.ts +3 -1
- package/lib/browser/workspace-breadcrumbs-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-breadcrumbs-contribution.js +23 -14
- package/lib/browser/workspace-breadcrumbs-contribution.js.map +1 -1
- package/lib/browser/workspace-commands.d.ts +5 -5
- package/lib/browser/workspace-commands.d.ts.map +1 -1
- package/lib/browser/workspace-commands.js +129 -146
- package/lib/browser/workspace-commands.js.map +1 -1
- package/lib/browser/workspace-commands.spec.js +50 -52
- package/lib/browser/workspace-commands.spec.js.map +1 -1
- package/lib/browser/workspace-compare-handler.d.ts +1 -1
- package/lib/browser/workspace-compare-handler.d.ts.map +1 -1
- package/lib/browser/workspace-compare-handler.js +8 -12
- package/lib/browser/workspace-compare-handler.js.map +1 -1
- package/lib/browser/workspace-delete-handler.d.ts +2 -2
- package/lib/browser/workspace-delete-handler.d.ts.map +1 -1
- package/lib/browser/workspace-delete-handler.js +42 -51
- package/lib/browser/workspace-delete-handler.js.map +1 -1
- package/lib/browser/workspace-duplicate-handler.d.ts +2 -2
- package/lib/browser/workspace-duplicate-handler.d.ts.map +1 -1
- package/lib/browser/workspace-duplicate-handler.js +20 -27
- package/lib/browser/workspace-duplicate-handler.js.map +1 -1
- package/lib/browser/workspace-files-exclude-filter-provider.d.ts +1 -1
- package/lib/browser/workspace-files-exclude-filter-provider.d.ts.map +1 -1
- package/lib/browser/workspace-files-exclude-filter-provider.js +12 -19
- package/lib/browser/workspace-files-exclude-filter-provider.js.map +1 -1
- package/lib/browser/workspace-frontend-contribution.d.ts +4 -4
- package/lib/browser/workspace-frontend-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-frontend-contribution.js +129 -143
- package/lib/browser/workspace-frontend-contribution.js.map +1 -1
- package/lib/browser/workspace-frontend-module.js +85 -87
- package/lib/browser/workspace-frontend-module.js.map +1 -1
- package/lib/browser/workspace-input-dialog.js +13 -18
- package/lib/browser/workspace-input-dialog.js.map +1 -1
- package/lib/browser/workspace-schema-updater.d.ts +1 -1
- package/lib/browser/workspace-schema-updater.d.ts.map +1 -1
- package/lib/browser/workspace-schema-updater.js +36 -40
- package/lib/browser/workspace-schema-updater.js.map +1 -1
- package/lib/browser/workspace-search-filter-service.js +13 -20
- package/lib/browser/workspace-search-filter-service.js.map +1 -1
- package/lib/browser/workspace-search-filter-service.spec.js +18 -20
- package/lib/browser/workspace-search-filter-service.spec.js.map +1 -1
- package/lib/browser/workspace-service.d.ts +134 -5
- package/lib/browser/workspace-service.d.ts.map +1 -1
- package/lib/browser/workspace-service.js +409 -157
- package/lib/browser/workspace-service.js.map +1 -1
- package/lib/browser/workspace-service.spec.d.ts +2 -0
- package/lib/browser/workspace-service.spec.d.ts.map +1 -0
- package/lib/browser/workspace-service.spec.js +425 -0
- package/lib/browser/workspace-service.spec.js.map +1 -0
- package/lib/browser/workspace-storage-service.d.ts +1 -1
- package/lib/browser/workspace-storage-service.d.ts.map +1 -1
- package/lib/browser/workspace-storage-service.js +13 -21
- package/lib/browser/workspace-storage-service.js.map +1 -1
- package/lib/browser/workspace-trust-dialog.js +9 -13
- package/lib/browser/workspace-trust-dialog.js.map +1 -1
- package/lib/browser/workspace-trust-service.d.ts +3 -3
- package/lib/browser/workspace-trust-service.d.ts.map +1 -1
- package/lib/browser/workspace-trust-service.js +106 -127
- package/lib/browser/workspace-trust-service.js.map +1 -1
- package/lib/browser/workspace-trust-service.spec.js +146 -148
- package/lib/browser/workspace-trust-service.spec.js.map +1 -1
- package/lib/browser/workspace-uri-contribution.d.ts +27 -2
- package/lib/browser/workspace-uri-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-uri-contribution.js +79 -32
- package/lib/browser/workspace-uri-contribution.js.map +1 -1
- package/lib/browser/workspace-uri-contribution.spec.js +130 -70
- package/lib/browser/workspace-uri-contribution.spec.js.map +1 -1
- package/lib/browser/workspace-user-working-directory-provider.d.ts +1 -1
- package/lib/browser/workspace-user-working-directory-provider.d.ts.map +1 -1
- package/lib/browser/workspace-user-working-directory-provider.js +13 -18
- package/lib/browser/workspace-user-working-directory-provider.js.map +1 -1
- package/lib/browser/workspace-utils.d.ts +1 -1
- package/lib/browser/workspace-utils.d.ts.map +1 -1
- package/lib/browser/workspace-utils.js +8 -12
- package/lib/browser/workspace-utils.js.map +1 -1
- package/lib/browser/workspace-variable-contribution.d.ts +1 -1
- package/lib/browser/workspace-variable-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-variable-contribution.js +37 -47
- package/lib/browser/workspace-variable-contribution.js.map +1 -1
- package/lib/browser/workspace-window-title-updater.d.ts +1 -1
- package/lib/browser/workspace-window-title-updater.d.ts.map +1 -1
- package/lib/browser/workspace-window-title-updater.js +12 -16
- package/lib/browser/workspace-window-title-updater.js.map +1 -1
- package/lib/browser-only/browser-only-workspace-server.d.ts +1 -1
- package/lib/browser-only/browser-only-workspace-server.d.ts.map +1 -1
- package/lib/browser-only/browser-only-workspace-server.js +17 -22
- package/lib/browser-only/browser-only-workspace-server.js.map +1 -1
- package/lib/browser-only/workspace-frontend-only-module.js +8 -10
- package/lib/browser-only/workspace-frontend-only-module.js.map +1 -1
- package/lib/common/index.d.ts +4 -4
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js +4 -7
- package/lib/common/index.js.map +1 -1
- package/lib/common/test/mock-workspace-server.d.ts +1 -1
- package/lib/common/test/mock-workspace-server.d.ts.map +1 -1
- package/lib/common/test/mock-workspace-server.js +5 -8
- package/lib/common/test/mock-workspace-server.js.map +1 -1
- package/lib/common/untitled-workspace-service.d.ts +1 -1
- package/lib/common/untitled-workspace-service.d.ts.map +1 -1
- package/lib/common/untitled-workspace-service.js +8 -12
- package/lib/common/untitled-workspace-service.js.map +1 -1
- package/lib/common/workspace-file-service.js +11 -14
- package/lib/common/workspace-file-service.js.map +1 -1
- package/lib/common/workspace-preferences.js +14 -19
- package/lib/common/workspace-preferences.js.map +1 -1
- package/lib/common/workspace-protocol.js +2 -5
- package/lib/common/workspace-protocol.js.map +1 -1
- package/lib/common/workspace-trust-preferences.js +29 -34
- package/lib/common/workspace-trust-preferences.js.map +1 -1
- package/lib/electron-browser/electron-workspace-contribution.d.ts +1 -1
- package/lib/electron-browser/electron-workspace-contribution.d.ts.map +1 -1
- package/lib/electron-browser/electron-workspace-contribution.js +11 -15
- package/lib/electron-browser/electron-workspace-contribution.js.map +1 -1
- package/lib/electron-browser/electron-workspace-module.js +6 -8
- package/lib/electron-browser/electron-workspace-module.js.map +1 -1
- package/lib/node/default-workspace-server.d.ts +1 -1
- package/lib/node/default-workspace-server.d.ts.map +1 -1
- package/lib/node/default-workspace-server.js +51 -63
- package/lib/node/default-workspace-server.js.map +1 -1
- package/lib/node/default-workspace-server.spec.js +29 -31
- package/lib/node/default-workspace-server.spec.js.map +1 -1
- package/lib/node/index.d.ts +2 -2
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +2 -5
- package/lib/node/index.js.map +1 -1
- package/lib/node/workspace-backend-module.js +21 -23
- package/lib/node/workspace-backend-module.js.map +1 -1
- package/package.json +17 -5
- package/src/browser/index.ts +8 -8
- package/src/browser/metadata-storage/index.ts +2 -2
- package/src/browser/metadata-storage/workspace-metadata-storage-service.spec.ts +4 -5
- package/src/browser/metadata-storage/workspace-metadata-storage-service.ts +10 -3
- package/src/browser/metadata-storage/workspace-metadata-store.ts +1 -1
- package/src/browser/quick-open-workspace.ts +2 -2
- package/src/browser/test/with-workspace-service-defaults.ts +26 -0
- package/src/browser/workspace-breadcrumbs-contribution.ts +16 -1
- package/src/browser/workspace-commands.spec.ts +6 -6
- package/src/browser/workspace-commands.ts +7 -8
- package/src/browser/workspace-compare-handler.ts +1 -1
- package/src/browser/workspace-delete-handler.ts +2 -2
- package/src/browser/workspace-duplicate-handler.ts +2 -2
- package/src/browser/workspace-files-exclude-filter-provider.ts +1 -1
- package/src/browser/workspace-frontend-contribution.ts +10 -8
- package/src/browser/workspace-frontend-module.ts +25 -25
- package/src/browser/workspace-schema-updater.ts +5 -1
- package/src/browser/workspace-search-filter-service.spec.ts +1 -1
- package/src/browser/workspace-service.spec.ts +508 -0
- package/src/browser/workspace-service.ts +353 -44
- package/src/browser/workspace-storage-service.ts +1 -1
- package/src/browser/workspace-trust-service.spec.ts +2 -2
- package/src/browser/workspace-trust-service.ts +5 -5
- package/src/browser/workspace-uri-contribution.spec.ts +76 -6
- package/src/browser/workspace-uri-contribution.ts +61 -4
- package/src/browser/workspace-user-working-directory-provider.ts +1 -1
- package/src/browser/workspace-utils.ts +1 -1
- package/src/browser/workspace-variable-contribution.ts +1 -1
- package/src/browser/workspace-window-title-updater.ts +1 -1
- package/src/browser-only/browser-only-workspace-server.ts +1 -1
- package/src/browser-only/workspace-frontend-only-module.ts +2 -2
- package/src/common/index.ts +4 -4
- package/src/common/test/mock-workspace-server.ts +1 -1
- package/src/common/untitled-workspace-service.ts +1 -1
- package/src/electron-browser/electron-workspace-contribution.ts +1 -1
- package/src/electron-browser/electron-workspace-module.ts +1 -1
- package/src/node/default-workspace-server.spec.ts +2 -2
- package/src/node/default-workspace-server.ts +1 -1
- package/src/node/index.ts +2 -2
- package/src/node/workspace-backend-module.ts +3 -3
- package/src/typings/valid-filename.d.ts +20 -0
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
|
|
18
18
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
19
19
|
import { ILogger, Emitter, Event, Disposable, DisposableCollection, URI } from '@theia/core/lib/common';
|
|
20
|
-
import { WorkspaceService } from '../workspace-service';
|
|
20
|
+
import { WorkspaceService } from '../workspace-service.js';
|
|
21
21
|
|
|
22
22
|
/**
|
|
23
23
|
* Represents a metadata store for a specific key within a workspace.
|
|
@@ -17,10 +17,10 @@
|
|
|
17
17
|
import { injectable, inject, optional, named } from '@theia/core/shared/inversify';
|
|
18
18
|
import { QuickPickItem, LabelProvider, QuickInputService, QuickInputButton, QuickPickSeparator } from '@theia/core/lib/browser';
|
|
19
19
|
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
|
|
20
|
-
import { WorkspaceOpenHandlerContribution, WorkspaceService } from './workspace-service';
|
|
20
|
+
import { WorkspaceOpenHandlerContribution, WorkspaceService } from './workspace-service.js';
|
|
21
21
|
import URI from '@theia/core/lib/common/uri';
|
|
22
22
|
import { ContributionProvider, nls, Path } from '@theia/core/lib/common';
|
|
23
|
-
import { UntitledWorkspaceService } from '../common/untitled-workspace-service';
|
|
23
|
+
import { UntitledWorkspaceService } from '../common/untitled-workspace-service.js';
|
|
24
24
|
|
|
25
25
|
interface RecentlyOpenedPick extends QuickPickItem {
|
|
26
26
|
resource?: URI
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2026 STMicroelectronics and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
|
|
17
|
+
import { WorkspaceService } from '../workspace-service.js';
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* Turns a partial mock of the workspace service into one that falls back to the real
|
|
21
|
+
* `WorkspaceService` methods for anything it does not stub, such as the root naming that
|
|
22
|
+
* is computed from `tryGetRoots()`. The mock is modified in place and returned.
|
|
23
|
+
*/
|
|
24
|
+
export function withWorkspaceServiceDefaults(mock: object): WorkspaceService {
|
|
25
|
+
return Object.setPrototypeOf(mock, WorkspaceService.prototype);
|
|
26
|
+
}
|
|
@@ -17,8 +17,9 @@
|
|
|
17
17
|
import { FilepathBreadcrumb } from '@theia/filesystem/lib/browser/breadcrumbs/filepath-breadcrumb';
|
|
18
18
|
import { FilepathBreadcrumbClassNameFactory, FilepathBreadcrumbsContribution } from '@theia/filesystem/lib/browser/breadcrumbs/filepath-breadcrumbs-contribution';
|
|
19
19
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
20
|
-
import { WorkspaceService } from './workspace-service';
|
|
20
|
+
import { WorkspaceService } from './workspace-service.js';
|
|
21
21
|
import URI from '@theia/core/lib/common/uri';
|
|
22
|
+
import { Breadcrumb } from '@theia/core/lib/browser/breadcrumbs/breadcrumbs-constants';
|
|
22
23
|
|
|
23
24
|
@injectable()
|
|
24
25
|
export class WorkspaceBreadcrumbsContribution extends FilepathBreadcrumbsContribution {
|
|
@@ -26,6 +27,20 @@ export class WorkspaceBreadcrumbsContribution extends FilepathBreadcrumbsContrib
|
|
|
26
27
|
@inject(WorkspaceService)
|
|
27
28
|
protected readonly workspaceService: WorkspaceService;
|
|
28
29
|
|
|
30
|
+
override async computeBreadcrumbs(uri: URI): Promise<Breadcrumb[]> {
|
|
31
|
+
const breadcrumbs = await super.computeBreadcrumbs(uri);
|
|
32
|
+
// Show the name given to the workspace root in the workspace file on its breadcrumb, which is shown in a multi-root workspace
|
|
33
|
+
const workspaceRoot = this.workspaceService.getWorkspaceRootUri(uri);
|
|
34
|
+
const rootName = workspaceRoot && this.workspaceService.getConfiguredRootName(workspaceRoot);
|
|
35
|
+
if (!rootName) {
|
|
36
|
+
return breadcrumbs;
|
|
37
|
+
}
|
|
38
|
+
return breadcrumbs.map(breadcrumb => FilepathBreadcrumb.is(breadcrumb) && breadcrumb.uri.isEqual(workspaceRoot)
|
|
39
|
+
? new FilepathBreadcrumb(breadcrumb.uri, rootName, breadcrumb.longLabel, breadcrumb.iconClass, breadcrumb.containerClass)
|
|
40
|
+
: breadcrumb
|
|
41
|
+
);
|
|
42
|
+
}
|
|
43
|
+
|
|
29
44
|
override getContainerClassCreator(fileURI: URI): FilepathBreadcrumbClassNameFactory {
|
|
30
45
|
const workspaceRoot = this.workspaceService.getWorkspaceRootUri(fileURI);
|
|
31
46
|
return (location, index) => {
|
|
@@ -29,12 +29,12 @@ import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
|
29
29
|
import { LabelProvider, OpenerService, FrontendApplication } from '@theia/core/lib/browser';
|
|
30
30
|
import { MessageService, OS } from '@theia/core/lib/common';
|
|
31
31
|
import { SelectionService } from '@theia/core/lib/common/selection-service';
|
|
32
|
-
import { WorkspaceCommandContribution } from './workspace-commands';
|
|
33
|
-
import { WorkspaceCompareHandler } from './workspace-compare-handler';
|
|
34
|
-
import { WorkspaceDeleteHandler } from './workspace-delete-handler';
|
|
35
|
-
import { WorkspaceDuplicateHandler } from './workspace-duplicate-handler';
|
|
36
|
-
import { WorkspacePreferences } from '../common/workspace-preferences';
|
|
37
|
-
import { WorkspaceService } from './workspace-service';
|
|
32
|
+
import { WorkspaceCommandContribution } from './workspace-commands.js';
|
|
33
|
+
import { WorkspaceCompareHandler } from './workspace-compare-handler.js';
|
|
34
|
+
import { WorkspaceDeleteHandler } from './workspace-delete-handler.js';
|
|
35
|
+
import { WorkspaceDuplicateHandler } from './workspace-duplicate-handler.js';
|
|
36
|
+
import { WorkspacePreferences } from '../common/workspace-preferences.js';
|
|
37
|
+
import { WorkspaceService } from './workspace-service.js';
|
|
38
38
|
import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
|
|
39
39
|
import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
|
|
40
40
|
|
|
@@ -24,23 +24,22 @@ import { FileDialogService } from '@theia/filesystem/lib/browser';
|
|
|
24
24
|
import { SingleTextInputDialog, ConfirmDialog, Dialog } from '@theia/core/lib/browser/dialogs';
|
|
25
25
|
import { OpenerService, OpenHandler, open, FrontendApplication, LabelProvider, CommonCommands } from '@theia/core/lib/browser';
|
|
26
26
|
import { UriCommandHandler, UriAwareCommandHandler } from '@theia/core/lib/common/uri-command-handler';
|
|
27
|
-
import { WorkspaceService } from './workspace-service';
|
|
27
|
+
import { WorkspaceService } from './workspace-service.js';
|
|
28
28
|
import { MessageService } from '@theia/core/lib/common/message-service';
|
|
29
|
-
import { WorkspacePreferences } from '../common/workspace-preferences';
|
|
30
|
-
import { WorkspaceDeleteHandler } from './workspace-delete-handler';
|
|
31
|
-
import { WorkspaceDuplicateHandler } from './workspace-duplicate-handler';
|
|
29
|
+
import { WorkspacePreferences } from '../common/workspace-preferences.js';
|
|
30
|
+
import { WorkspaceDeleteHandler } from './workspace-delete-handler.js';
|
|
31
|
+
import { WorkspaceDuplicateHandler } from './workspace-duplicate-handler.js';
|
|
32
32
|
import { FileSystemUtils } from '@theia/filesystem/lib/common';
|
|
33
|
-
import { WorkspaceCompareHandler } from './workspace-compare-handler';
|
|
33
|
+
import { WorkspaceCompareHandler } from './workspace-compare-handler.js';
|
|
34
34
|
import { FileDownloadCommands } from '@theia/filesystem/lib/browser/download/file-download-command-contribution';
|
|
35
35
|
import { FileSystemCommands } from '@theia/filesystem/lib/browser/filesystem-frontend-contribution';
|
|
36
|
-
import { WorkspaceInputDialog } from './workspace-input-dialog';
|
|
36
|
+
import { WorkspaceInputDialog } from './workspace-input-dialog.js';
|
|
37
37
|
import { Emitter, EOL, Event, OS } from '@theia/core/lib/common';
|
|
38
38
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
39
39
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
40
40
|
import { nls } from '@theia/core/lib/common/nls';
|
|
41
41
|
import { ClipboardService } from '@theia/core/lib/browser/clipboard-service';
|
|
42
|
-
|
|
43
|
-
const validFilename: (arg: string) => boolean = require('valid-filename');
|
|
42
|
+
import validFilename from 'valid-filename';
|
|
44
43
|
|
|
45
44
|
export namespace WorkspaceCommands {
|
|
46
45
|
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
18
|
import URI from '@theia/core/lib/common/uri';
|
|
19
19
|
import { UriCommandHandler } from '@theia/core/lib/common/uri-command-handler';
|
|
20
|
-
import { DiffService } from './diff-service';
|
|
20
|
+
import { DiffService } from './diff-service.js';
|
|
21
21
|
|
|
22
22
|
@injectable()
|
|
23
23
|
export class WorkspaceCompareHandler implements UriCommandHandler<URI[]> {
|
|
@@ -18,8 +18,8 @@ import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
|
18
18
|
import URI from '@theia/core/lib/common/uri';
|
|
19
19
|
import { ConfirmDialog, ApplicationShell, SaveableWidget, NavigatableWidget } from '@theia/core/lib/browser';
|
|
20
20
|
import { UriCommandHandler } from '@theia/core/lib/common/uri-command-handler';
|
|
21
|
-
import { WorkspaceService } from './workspace-service';
|
|
22
|
-
import { WorkspaceUtils } from './workspace-utils';
|
|
21
|
+
import { WorkspaceService } from './workspace-service.js';
|
|
22
|
+
import { WorkspaceUtils } from './workspace-utils.js';
|
|
23
23
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
24
24
|
import { FileSystemPreferences } from '@theia/filesystem/lib/common/filesystem-preferences';
|
|
25
25
|
import { FileDeleteOptions, FileSystemProviderCapabilities } from '@theia/filesystem/lib/common/files';
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
|
|
17
17
|
import URI from '@theia/core/lib/common/uri';
|
|
18
18
|
import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
19
|
-
import { WorkspaceUtils } from './workspace-utils';
|
|
20
|
-
import { WorkspaceService } from './workspace-service';
|
|
19
|
+
import { WorkspaceUtils } from './workspace-utils.js';
|
|
20
|
+
import { WorkspaceService } from './workspace-service.js';
|
|
21
21
|
import { UriCommandHandler } from '@theia/core/lib/common/uri-command-handler';
|
|
22
22
|
import { FileSystemUtils } from '@theia/filesystem/lib/common/filesystem-utils';
|
|
23
23
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { Emitter, Event } from '@theia/core';
|
|
18
18
|
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
19
19
|
import { FileSystemPreferences } from '@theia/filesystem/lib/common';
|
|
20
|
-
import { WorkspaceSearchFilterProvider } from './workspace-search-filter-service';
|
|
20
|
+
import { WorkspaceSearchFilterProvider } from './workspace-search-filter-service.js';
|
|
21
21
|
|
|
22
22
|
/**
|
|
23
23
|
* A workspace search filter provider that contributes the user-configurable
|
|
@@ -24,11 +24,11 @@ import {
|
|
|
24
24
|
} from '@theia/core/lib/browser';
|
|
25
25
|
import { FileDialogService, OpenFileDialogProps, FileDialogTreeFilters } from '@theia/filesystem/lib/browser';
|
|
26
26
|
import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
|
|
27
|
-
import { WorkspaceService } from './workspace-service';
|
|
28
|
-
import { WorkspaceFileService, THEIA_EXT, VSCODE_EXT } from '../common';
|
|
29
|
-
import { WorkspaceCommands } from './workspace-commands';
|
|
30
|
-
import { WorkspaceTrustService } from './workspace-trust-service';
|
|
31
|
-
import { QuickOpenWorkspace } from './quick-open-workspace';
|
|
27
|
+
import { WorkspaceService } from './workspace-service.js';
|
|
28
|
+
import { WorkspaceFileService, THEIA_EXT, VSCODE_EXT } from '../common/index.js';
|
|
29
|
+
import { WorkspaceCommands } from './workspace-commands.js';
|
|
30
|
+
import { WorkspaceTrustService } from './workspace-trust-service.js';
|
|
31
|
+
import { QuickOpenWorkspace } from './quick-open-workspace.js';
|
|
32
32
|
import URI from '@theia/core/lib/common/uri';
|
|
33
33
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
34
34
|
import { EncodingRegistry } from '@theia/core/lib/browser/encoding-registry';
|
|
@@ -38,7 +38,7 @@ import { PreferenceConfigurations } from '@theia/core/lib/common/preferences/pre
|
|
|
38
38
|
import { nls } from '@theia/core/lib/common/nls';
|
|
39
39
|
import { BinaryBuffer } from '@theia/core/lib/common/buffer';
|
|
40
40
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
41
|
-
import { UntitledWorkspaceExitDialog } from './untitled-workspace-exit-dialog';
|
|
41
|
+
import { UntitledWorkspaceExitDialog } from './untitled-workspace-exit-dialog.js';
|
|
42
42
|
import { FilesystemSaveableService } from '@theia/filesystem/lib/browser/filesystem-saveable-service';
|
|
43
43
|
import { StopReason } from '@theia/core/lib/common/frontend-application-state';
|
|
44
44
|
|
|
@@ -404,7 +404,8 @@ export class WorkspaceFrontendContribution implements CommandContribution, Keybi
|
|
|
404
404
|
title: WorkspaceCommands.OPEN_WORKSPACE.dialogLabel,
|
|
405
405
|
canSelectFiles: true,
|
|
406
406
|
canSelectFolders: false,
|
|
407
|
-
filters: this.getWorkspaceDialogFileFilters()
|
|
407
|
+
filters: this.getWorkspaceDialogFileFilters(),
|
|
408
|
+
disableAllFilesFilter: true
|
|
408
409
|
};
|
|
409
410
|
const [rootStat] = await this.workspaceService.roots;
|
|
410
411
|
const workspaceFileUri = await this.fileDialogService.showOpenDialog(props, rootStat);
|
|
@@ -432,7 +433,8 @@ export class WorkspaceFrontendContribution implements CommandContribution, Keybi
|
|
|
432
433
|
do {
|
|
433
434
|
selected = await this.fileDialogService.showSaveDialog({
|
|
434
435
|
title: WorkspaceCommands.SAVE_WORKSPACE_AS.label!,
|
|
435
|
-
filters: this.getWorkspaceDialogFileFilters()
|
|
436
|
+
filters: this.getWorkspaceDialogFileFilters(),
|
|
437
|
+
disableAllFilesFilter: true
|
|
436
438
|
});
|
|
437
439
|
if (selected) {
|
|
438
440
|
const displayName = selected.displayName;
|
|
@@ -32,35 +32,35 @@ import {
|
|
|
32
32
|
import { StorageService } from '@theia/core/lib/browser/storage-service';
|
|
33
33
|
import { LabelProviderContribution } from '@theia/core/lib/browser/label-provider';
|
|
34
34
|
import { VariableContribution } from '@theia/variable-resolver/lib/browser';
|
|
35
|
-
import { WorkspaceServer, workspacePath, UntitledWorkspaceService, WorkspaceFileService } from '../common';
|
|
36
|
-
import { WorkspaceFrontendContribution } from './workspace-frontend-contribution';
|
|
37
|
-
import { WorkspaceHandlingContribution, WorkspaceOpenHandlerContribution, WorkspaceService } from './workspace-service';
|
|
38
|
-
import { WorkspaceCommandContribution, FileMenuContribution, EditMenuContribution } from './workspace-commands';
|
|
39
|
-
import { WorkspaceVariableContribution } from './workspace-variable-contribution';
|
|
40
|
-
import { WorkspaceStorageService } from './workspace-storage-service';
|
|
41
|
-
import { WorkspaceUriLabelProviderContribution } from './workspace-uri-contribution';
|
|
42
|
-
import { bindWorkspacePreferences } from '../common/workspace-preferences';
|
|
43
|
-
import { QuickOpenWorkspace } from './quick-open-workspace';
|
|
44
|
-
import { WorkspaceDeleteHandler } from './workspace-delete-handler';
|
|
45
|
-
import { WorkspaceDuplicateHandler } from './workspace-duplicate-handler';
|
|
46
|
-
import { WorkspaceUtils } from './workspace-utils';
|
|
47
|
-
import { WorkspaceCompareHandler } from './workspace-compare-handler';
|
|
48
|
-
import { DiffService } from './diff-service';
|
|
35
|
+
import { WorkspaceServer, workspacePath, UntitledWorkspaceService, WorkspaceFileService } from '../common/index.js';
|
|
36
|
+
import { WorkspaceFrontendContribution } from './workspace-frontend-contribution.js';
|
|
37
|
+
import { WorkspaceHandlingContribution, WorkspaceOpenHandlerContribution, WorkspaceService } from './workspace-service.js';
|
|
38
|
+
import { WorkspaceCommandContribution, FileMenuContribution, EditMenuContribution } from './workspace-commands.js';
|
|
39
|
+
import { WorkspaceVariableContribution } from './workspace-variable-contribution.js';
|
|
40
|
+
import { WorkspaceStorageService } from './workspace-storage-service.js';
|
|
41
|
+
import { WorkspaceUriLabelProviderContribution } from './workspace-uri-contribution.js';
|
|
42
|
+
import { bindWorkspacePreferences } from '../common/workspace-preferences.js';
|
|
43
|
+
import { QuickOpenWorkspace } from './quick-open-workspace.js';
|
|
44
|
+
import { WorkspaceDeleteHandler } from './workspace-delete-handler.js';
|
|
45
|
+
import { WorkspaceDuplicateHandler } from './workspace-duplicate-handler.js';
|
|
46
|
+
import { WorkspaceUtils } from './workspace-utils.js';
|
|
47
|
+
import { WorkspaceCompareHandler } from './workspace-compare-handler.js';
|
|
48
|
+
import { DiffService } from './diff-service.js';
|
|
49
49
|
import { JsonSchemaContribution } from '@theia/core/lib/browser/json-schema-store';
|
|
50
|
-
import { WorkspaceSchemaUpdater } from './workspace-schema-updater';
|
|
51
|
-
import { WorkspaceBreadcrumbsContribution } from './workspace-breadcrumbs-contribution';
|
|
50
|
+
import { WorkspaceSchemaUpdater } from './workspace-schema-updater.js';
|
|
51
|
+
import { WorkspaceBreadcrumbsContribution } from './workspace-breadcrumbs-contribution.js';
|
|
52
52
|
import { FilepathBreadcrumbsContribution } from '@theia/filesystem/lib/browser/breadcrumbs/filepath-breadcrumbs-contribution';
|
|
53
|
-
import { WorkspaceTrustService, WorkspaceRestrictionContribution } from './workspace-trust-service';
|
|
54
|
-
import { bindWorkspaceTrustPreferences } from '../common/workspace-trust-preferences';
|
|
53
|
+
import { WorkspaceTrustService, WorkspaceRestrictionContribution } from './workspace-trust-service.js';
|
|
54
|
+
import { bindWorkspaceTrustPreferences } from '../common/workspace-trust-preferences.js';
|
|
55
55
|
import { UserWorkingDirectoryProvider } from '@theia/core/lib/browser/user-working-directory-provider';
|
|
56
|
-
import { WorkspaceUserWorkingDirectoryProvider } from './workspace-user-working-directory-provider';
|
|
56
|
+
import { WorkspaceUserWorkingDirectoryProvider } from './workspace-user-working-directory-provider.js';
|
|
57
57
|
import { WindowTitleUpdater } from '@theia/core/lib/browser/window/window-title-updater';
|
|
58
|
-
import { WorkspaceWindowTitleUpdater } from './workspace-window-title-updater';
|
|
59
|
-
import { CanonicalUriService } from './canonical-uri-service';
|
|
60
|
-
import { WorkspaceMetadataStorageService, WorkspaceMetadataStorageServiceImpl, WorkspaceMetadataStoreFactory } from './metadata-storage';
|
|
61
|
-
import { WorkspaceMetadataStoreImpl } from './metadata-storage/workspace-metadata-store';
|
|
62
|
-
import { WorkspaceSearchFilterService, WorkspaceSearchFilterProvider } from './workspace-search-filter-service';
|
|
63
|
-
import { WorkspaceFilesExcludeFilterProvider } from './workspace-files-exclude-filter-provider';
|
|
58
|
+
import { WorkspaceWindowTitleUpdater } from './workspace-window-title-updater.js';
|
|
59
|
+
import { CanonicalUriService } from './canonical-uri-service.js';
|
|
60
|
+
import { WorkspaceMetadataStorageService, WorkspaceMetadataStorageServiceImpl, WorkspaceMetadataStoreFactory } from './metadata-storage/index.js';
|
|
61
|
+
import { WorkspaceMetadataStoreImpl } from './metadata-storage/workspace-metadata-store.js';
|
|
62
|
+
import { WorkspaceSearchFilterService, WorkspaceSearchFilterProvider } from './workspace-search-filter-service.js';
|
|
63
|
+
import { WorkspaceFilesExcludeFilterProvider } from './workspace-files-exclude-filter-provider.js';
|
|
64
64
|
|
|
65
65
|
export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: interfaces.IsBound, rebind: interfaces.Rebind) => {
|
|
66
66
|
bindWorkspacePreferences(bind);
|
|
@@ -20,7 +20,7 @@ import { isArray, isObject, nls } from '@theia/core/lib/common';
|
|
|
20
20
|
import { IJSONSchema } from '@theia/core/lib/common/json-schema';
|
|
21
21
|
import URI from '@theia/core/lib/common/uri';
|
|
22
22
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
23
|
-
import { WorkspaceFileService } from '../common';
|
|
23
|
+
import { WorkspaceFileService } from '../common/index.js';
|
|
24
24
|
|
|
25
25
|
export interface SchemaUpdateMessage {
|
|
26
26
|
key: string,
|
|
@@ -139,6 +139,10 @@ export const workspaceSchema: IJSONSchema = {
|
|
|
139
139
|
properties: {
|
|
140
140
|
path: {
|
|
141
141
|
type: 'string',
|
|
142
|
+
},
|
|
143
|
+
name: {
|
|
144
|
+
type: 'string',
|
|
145
|
+
description: nls.localize('theia/workspace/schema/folders/name/description', 'An optional name for the folder, shown instead of the folder name')
|
|
142
146
|
}
|
|
143
147
|
},
|
|
144
148
|
required: ['path']
|
|
@@ -18,7 +18,7 @@ import { expect } from 'chai';
|
|
|
18
18
|
import * as sinon from 'sinon';
|
|
19
19
|
import { Emitter } from '@theia/core';
|
|
20
20
|
import { ContributionProvider } from '@theia/core/lib/common';
|
|
21
|
-
import { WorkspaceSearchFilterProvider, WorkspaceSearchFilterService } from './workspace-search-filter-service';
|
|
21
|
+
import { WorkspaceSearchFilterProvider, WorkspaceSearchFilterService } from './workspace-search-filter-service.js';
|
|
22
22
|
|
|
23
23
|
class MockProvider implements WorkspaceSearchFilterProvider {
|
|
24
24
|
protected readonly onExclusionGlobsChangedEmitter = new Emitter<void>();
|