@theia/workspace 1.77.0-next.99 → 1.78.0-next.0
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 -74
- 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 +1 -1
- package/lib/browser/test/with-workspace-service-defaults.d.ts.map +1 -1
- package/lib/browser/test/with-workspace-service-defaults.js +3 -6
- package/lib/browser/test/with-workspace-service-defaults.js.map +1 -1
- package/lib/browser/untitled-workspace-exit-dialog.js +14 -18
- package/lib/browser/untitled-workspace-exit-dialog.js.map +1 -1
- package/lib/browser/workspace-breadcrumbs-contribution.d.ts +1 -1
- package/lib/browser/workspace-breadcrumbs-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-breadcrumbs-contribution.js +13 -17
- 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 -53
- 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 +125 -141
- 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 +33 -41
- 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 -21
- package/lib/browser/workspace-search-filter-service.spec.js.map +1 -1
- package/lib/browser/workspace-service.d.ts +3 -3
- package/lib/browser/workspace-service.d.ts.map +1 -1
- package/lib/browser/workspace-service.js +107 -130
- package/lib/browser/workspace-service.js.map +1 -1
- package/lib/browser/workspace-service.spec.js +106 -109
- package/lib/browser/workspace-service.spec.js.map +1 -1
- 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 +159 -150
- package/lib/browser/workspace-trust-service.spec.js.map +1 -1
- package/lib/browser/workspace-uri-contribution.d.ts +2 -2
- package/lib/browser/workspace-uri-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-uri-contribution.js +23 -31
- package/lib/browser/workspace-uri-contribution.js.map +1 -1
- package/lib/browser/workspace-uri-contribution.spec.js +95 -98
- 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 -32
- 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 +18 -6
- 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 +1 -1
- package/src/browser/untitled-workspace-exit-dialog.ts +1 -1
- package/src/browser/workspace-breadcrumbs-contribution.ts +1 -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 +6 -6
- package/src/browser/workspace-frontend-module.ts +25 -25
- package/src/browser/workspace-schema-updater.ts +1 -1
- package/src/browser/workspace-search-filter-service.spec.ts +1 -1
- package/src/browser/workspace-service.spec.ts +1 -1
- package/src/browser/workspace-service.ts +3 -3
- package/src/browser/workspace-storage-service.ts +1 -1
- package/src/browser/workspace-trust-service.spec.ts +15 -3
- package/src/browser/workspace-trust-service.ts +5 -5
- package/src/browser/workspace-uri-contribution.spec.ts +3 -3
- package/src/browser/workspace-uri-contribution.ts +2 -2
- 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
package/package.json
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/workspace",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.78.0-next.0+b0e3080cb",
|
|
4
4
|
"description": "Theia - Workspace Extension",
|
|
5
|
+
"type": "module",
|
|
5
6
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.
|
|
7
|
-
"@theia/filesystem": "1.
|
|
8
|
-
"@theia/variable-resolver": "1.
|
|
7
|
+
"@theia/core": "1.78.0-next.0+b0e3080cb",
|
|
8
|
+
"@theia/filesystem": "1.78.0-next.0+b0e3080cb",
|
|
9
|
+
"@theia/variable-resolver": "1.78.0-next.0+b0e3080cb",
|
|
9
10
|
"jsonc-parser": "^3.3.1",
|
|
10
11
|
"tslib": "^2.8.1",
|
|
11
12
|
"valid-filename": "^2.0.1"
|
|
@@ -50,10 +51,21 @@
|
|
|
50
51
|
"watch": "theiaext watch"
|
|
51
52
|
},
|
|
52
53
|
"devDependencies": {
|
|
53
|
-
"@theia/ext-scripts": "1.
|
|
54
|
+
"@theia/ext-scripts": "1.77.0"
|
|
54
55
|
},
|
|
55
56
|
"nyc": {
|
|
56
57
|
"extends": "../../configs/nyc.json"
|
|
57
58
|
},
|
|
58
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "b0e3080cb1b1fff5616555f1bf679834129da171",
|
|
60
|
+
"exports": {
|
|
61
|
+
"./package.json": "./package.json",
|
|
62
|
+
"./lib/browser": "./lib/browser/index.js",
|
|
63
|
+
"./lib/browser/metadata-storage": "./lib/browser/metadata-storage/index.js",
|
|
64
|
+
"./lib/common": "./lib/common/index.js",
|
|
65
|
+
"./lib/node": "./lib/node/index.js",
|
|
66
|
+
"./lib/*.json": "./lib/*.json",
|
|
67
|
+
"./lib/*.js": "./lib/*.js",
|
|
68
|
+
"./lib/*": "./lib/*.js",
|
|
69
|
+
"./*": "./*"
|
|
70
|
+
}
|
|
59
71
|
}
|
package/src/browser/index.ts
CHANGED
|
@@ -14,11 +14,11 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
export * from './workspace-commands';
|
|
18
|
-
export * from './workspace-service';
|
|
19
|
-
export * from './canonical-uri-service';
|
|
20
|
-
export * from './workspace-frontend-contribution';
|
|
21
|
-
export * from './workspace-frontend-module';
|
|
22
|
-
export * from './workspace-trust-service';
|
|
23
|
-
export * from './metadata-storage';
|
|
24
|
-
export * from './workspace-search-filter-service';
|
|
17
|
+
export * from './workspace-commands.js';
|
|
18
|
+
export * from './workspace-service.js';
|
|
19
|
+
export * from './canonical-uri-service.js';
|
|
20
|
+
export * from './workspace-frontend-contribution.js';
|
|
21
|
+
export * from './workspace-frontend-module.js';
|
|
22
|
+
export * from './workspace-trust-service.js';
|
|
23
|
+
export * from './metadata-storage/index.js';
|
|
24
|
+
export * from './workspace-search-filter-service.js';
|
|
@@ -14,10 +14,10 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
|
|
17
|
-
export { WorkspaceMetadataStore, WorkspaceMetadataStoreImpl } from './workspace-metadata-store';
|
|
17
|
+
export { WorkspaceMetadataStore, WorkspaceMetadataStoreImpl } from './workspace-metadata-store.js';
|
|
18
18
|
export {
|
|
19
19
|
WorkspaceMetadataStorageService,
|
|
20
20
|
WorkspaceMetadataStorageServiceImpl,
|
|
21
21
|
WorkspaceMetadataIndex,
|
|
22
22
|
WorkspaceMetadataStoreFactory
|
|
23
|
-
} from './workspace-metadata-storage-service';
|
|
23
|
+
} from './workspace-metadata-storage-service.js';
|
|
@@ -29,10 +29,9 @@ import { URI } from '@theia/core/lib/common/uri';
|
|
|
29
29
|
import { BinaryBuffer } from '@theia/core/lib/common/buffer';
|
|
30
30
|
import { FileContent, FileStat, FileStatWithMetadata } from '@theia/filesystem/lib/common/files';
|
|
31
31
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
32
|
-
import { WorkspaceService } from '../workspace-service';
|
|
33
|
-
import { WorkspaceMetadataStorageServiceImpl, WorkspaceMetadataStoreFactory } from './workspace-metadata-storage-service';
|
|
34
|
-
import { WorkspaceMetadataStoreImpl } from './workspace-metadata-store';
|
|
35
|
-
import * as uuid from '@theia/core/lib/common/uuid';
|
|
32
|
+
import { WorkspaceService } from '../workspace-service.js';
|
|
33
|
+
import { WorkspaceMetadataStorageServiceImpl, WorkspaceMetadataStoreFactory } from './workspace-metadata-storage-service.js';
|
|
34
|
+
import { WorkspaceMetadataStoreImpl } from './workspace-metadata-store.js';
|
|
36
35
|
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
37
36
|
|
|
38
37
|
disableJSDOM();
|
|
@@ -91,7 +90,7 @@ describe('WorkspaceMetadataStorageService', () => {
|
|
|
91
90
|
service = container.get(WorkspaceMetadataStorageServiceImpl);
|
|
92
91
|
|
|
93
92
|
// Stub UUID generation
|
|
94
|
-
generateUuidStub = sinon.stub(
|
|
93
|
+
generateUuidStub = sinon.stub(service as unknown as { generateWorkspaceKey(): string }, 'generateWorkspaceKey');
|
|
95
94
|
|
|
96
95
|
// Default file service behavior
|
|
97
96
|
fileService.exists.resolves(false);
|
|
@@ -21,8 +21,8 @@ import { ILogger } from '@theia/core/lib/common/logger';
|
|
|
21
21
|
import { URI } from '@theia/core/lib/common/uri';
|
|
22
22
|
import { generateUuid } from '@theia/core/lib/common/uuid';
|
|
23
23
|
import { BinaryBuffer } from '@theia/core/lib/common/buffer';
|
|
24
|
-
import { WorkspaceService } from '../workspace-service';
|
|
25
|
-
import { WorkspaceMetadataStore, WorkspaceMetadataStoreImpl } from './workspace-metadata-store';
|
|
24
|
+
import { WorkspaceService } from '../workspace-service.js';
|
|
25
|
+
import { WorkspaceMetadataStore, WorkspaceMetadataStoreImpl } from './workspace-metadata-store.js';
|
|
26
26
|
|
|
27
27
|
export const WorkspaceMetadataStoreFactory = Symbol('WorkspaceMetadataStoreFactory');
|
|
28
28
|
export type WorkspaceMetadataStoreFactory = () => WorkspaceMetadataStoreImpl;
|
|
@@ -154,7 +154,7 @@ export class WorkspaceMetadataStorageServiceImpl implements WorkspaceMetadataSto
|
|
|
154
154
|
return index[workspacePath];
|
|
155
155
|
}
|
|
156
156
|
|
|
157
|
-
const newUuid =
|
|
157
|
+
const newUuid = this.generateWorkspaceKey();
|
|
158
158
|
index[workspacePath] = newUuid;
|
|
159
159
|
|
|
160
160
|
await this.saveIndex(index);
|
|
@@ -241,4 +241,11 @@ export class WorkspaceMetadataStorageServiceImpl implements WorkspaceMetadataSto
|
|
|
241
241
|
const workspaceUuid = await this.getOrCreateWorkspaceUUID(workspaceRoot);
|
|
242
242
|
return this.getStoreLocation(workspaceUuid, mangledKey);
|
|
243
243
|
}
|
|
244
|
+
|
|
245
|
+
/**
|
|
246
|
+
* Generates the key under which the metadata of a workspace is stored.
|
|
247
|
+
*/
|
|
248
|
+
protected generateWorkspaceKey(): string {
|
|
249
|
+
return generateUuid();
|
|
250
|
+
}
|
|
244
251
|
}
|
|
@@ -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
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { WorkspaceService } from '../workspace-service';
|
|
17
|
+
import { WorkspaceService } from '../workspace-service.js';
|
|
18
18
|
|
|
19
19
|
/**
|
|
20
20
|
* Turns a partial mock of the workspace service into one that falls back to the real
|
|
@@ -30,7 +30,7 @@ export class UntitledWorkspaceExitDialog extends AbstractDialog<UntitledWorkspac
|
|
|
30
30
|
@inject(DialogProps) props: DialogProps
|
|
31
31
|
) {
|
|
32
32
|
super(props);
|
|
33
|
-
const messageNode =
|
|
33
|
+
const messageNode = this.node.ownerDocument.createElement('div');
|
|
34
34
|
messageNode.textContent = nls.localizeByDefault('Save your workspace if you plan to open it again.');
|
|
35
35
|
this.contentNode.appendChild(messageNode);
|
|
36
36
|
this.dontSaveButton = this.createButton(nls.localizeByDefault(UntitledWorkspaceExitDialog.Values["Don't Save"]));
|
|
@@ -17,7 +17,7 @@
|
|
|
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
22
|
import { Breadcrumb } from '@theia/core/lib/browser/breadcrumbs/breadcrumbs-constants';
|
|
23
23
|
|
|
@@ -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
|
|
|
@@ -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,
|
|
@@ -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>();
|
|
@@ -24,7 +24,7 @@ import { expect } from 'chai';
|
|
|
24
24
|
import URI from '@theia/core/lib/common/uri';
|
|
25
25
|
import { OS } from '@theia/core/lib/common/os';
|
|
26
26
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
27
|
-
import { WorkspaceData, WorkspaceService } from './workspace-service';
|
|
27
|
+
import { WorkspaceData, WorkspaceService } from './workspace-service.js';
|
|
28
28
|
|
|
29
29
|
disableJSDOM();
|
|
30
30
|
|
|
@@ -17,21 +17,21 @@
|
|
|
17
17
|
import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
|
|
18
18
|
import URI from '@theia/core/lib/common/uri';
|
|
19
19
|
import { Path } from '@theia/core/lib/common/path';
|
|
20
|
-
import { WorkspaceServer, UntitledWorkspaceService, WorkspaceFileService } from '../common';
|
|
20
|
+
import { WorkspaceServer, UntitledWorkspaceService, WorkspaceFileService } from '../common/index.js';
|
|
21
21
|
import { WindowService } from '@theia/core/lib/browser/window/window-service';
|
|
22
22
|
import { DEFAULT_WINDOW_HASH } from '@theia/core/lib/common/window';
|
|
23
23
|
import { FrontendApplicationContribution, LabelProvider, OnWillStopAction } from '@theia/core/lib/browser';
|
|
24
24
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
25
25
|
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
|
|
26
26
|
import { ILogger, Disposable, DisposableCollection, Emitter, environment, Event, MaybePromise, MessageService, nls, ContributionProvider } from '@theia/core';
|
|
27
|
-
import { WorkspacePreferences } from '../common/workspace-preferences';
|
|
27
|
+
import { WorkspacePreferences } from '../common/workspace-preferences.js';
|
|
28
28
|
import * as jsoncparser from 'jsonc-parser';
|
|
29
29
|
import Ajv from '@theia/core/shared/ajv';
|
|
30
30
|
import { FileStat, BaseStat } from '@theia/filesystem/lib/common/files';
|
|
31
31
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
32
32
|
import { WindowTitleService } from '@theia/core/lib/browser/window/window-title-service';
|
|
33
33
|
import { FileSystemPreferences } from '@theia/filesystem/lib/common';
|
|
34
|
-
import { workspaceSchema, WorkspaceSchemaUpdater } from './workspace-schema-updater';
|
|
34
|
+
import { workspaceSchema, WorkspaceSchemaUpdater } from './workspace-schema-updater.js';
|
|
35
35
|
import { IJSONSchema } from '@theia/core/lib/common/json-schema';
|
|
36
36
|
import { StopReason } from '@theia/core/lib/common/frontend-application-state';
|
|
37
37
|
import { PreferenceSchemaService, PreferenceScope, PreferenceService } from '@theia/core/lib/common/preferences';
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
18
18
|
import { LocalStorageService, StorageService } from '@theia/core/lib/browser/storage-service';
|
|
19
|
-
import { WorkspaceService } from './workspace-service';
|
|
19
|
+
import { WorkspaceService } from './workspace-service.js';
|
|
20
20
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
21
21
|
|
|
22
22
|
/*
|
|
@@ -17,14 +17,14 @@
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
18
|
import * as sinon from 'sinon';
|
|
19
19
|
import { PreferenceChange, PreferenceScope } from '@theia/core/lib/common/preferences';
|
|
20
|
-
import { WorkspaceTrustService } from './workspace-trust-service';
|
|
20
|
+
import { WorkspaceTrustService } from './workspace-trust-service.js';
|
|
21
21
|
import {
|
|
22
22
|
WORKSPACE_TRUST_EMPTY_WINDOW,
|
|
23
23
|
WORKSPACE_TRUST_ENABLED,
|
|
24
24
|
WORKSPACE_TRUST_STARTUP_PROMPT,
|
|
25
25
|
WORKSPACE_TRUST_TRUSTED_FOLDERS,
|
|
26
26
|
WorkspaceTrustPrompt
|
|
27
|
-
} from '../common/workspace-trust-preferences';
|
|
27
|
+
} from '../common/workspace-trust-preferences.js';
|
|
28
28
|
import URI from '@theia/core/lib/common/uri';
|
|
29
29
|
|
|
30
30
|
class TestableWorkspaceTrustService extends WorkspaceTrustService {
|
|
@@ -336,6 +336,7 @@ describe('WorkspaceTrustService', () => {
|
|
|
336
336
|
preferenceName: WORKSPACE_TRUST_TRUSTED_FOLDERS,
|
|
337
337
|
scope: PreferenceScope.User,
|
|
338
338
|
domain: [],
|
|
339
|
+
affectedOverrides: [],
|
|
339
340
|
affects: () => true
|
|
340
341
|
};
|
|
341
342
|
|
|
@@ -352,6 +353,7 @@ describe('WorkspaceTrustService', () => {
|
|
|
352
353
|
preferenceName: WORKSPACE_TRUST_TRUSTED_FOLDERS,
|
|
353
354
|
scope: PreferenceScope.User,
|
|
354
355
|
domain: [],
|
|
356
|
+
affectedOverrides: [],
|
|
355
357
|
affects: () => true
|
|
356
358
|
};
|
|
357
359
|
|
|
@@ -368,6 +370,7 @@ describe('WorkspaceTrustService', () => {
|
|
|
368
370
|
preferenceName: WORKSPACE_TRUST_TRUSTED_FOLDERS,
|
|
369
371
|
scope: PreferenceScope.User,
|
|
370
372
|
domain: [],
|
|
373
|
+
affectedOverrides: [],
|
|
371
374
|
affects: () => true
|
|
372
375
|
};
|
|
373
376
|
|
|
@@ -390,6 +393,7 @@ describe('WorkspaceTrustService', () => {
|
|
|
390
393
|
preferenceName: WORKSPACE_TRUST_EMPTY_WINDOW,
|
|
391
394
|
scope: PreferenceScope.User,
|
|
392
395
|
domain: [],
|
|
396
|
+
affectedOverrides: [],
|
|
393
397
|
affects: () => true
|
|
394
398
|
};
|
|
395
399
|
|
|
@@ -405,6 +409,7 @@ describe('WorkspaceTrustService', () => {
|
|
|
405
409
|
preferenceName: WORKSPACE_TRUST_EMPTY_WINDOW,
|
|
406
410
|
scope: PreferenceScope.User,
|
|
407
411
|
domain: [],
|
|
412
|
+
affectedOverrides: [],
|
|
408
413
|
affects: () => true
|
|
409
414
|
};
|
|
410
415
|
|
|
@@ -421,6 +426,7 @@ describe('WorkspaceTrustService', () => {
|
|
|
421
426
|
preferenceName: WORKSPACE_TRUST_EMPTY_WINDOW,
|
|
422
427
|
scope: PreferenceScope.User,
|
|
423
428
|
domain: [],
|
|
429
|
+
affectedOverrides: [],
|
|
424
430
|
affects: () => true
|
|
425
431
|
};
|
|
426
432
|
|
|
@@ -437,6 +443,7 @@ describe('WorkspaceTrustService', () => {
|
|
|
437
443
|
preferenceName: WORKSPACE_TRUST_EMPTY_WINDOW,
|
|
438
444
|
scope: PreferenceScope.User,
|
|
439
445
|
domain: [],
|
|
446
|
+
affectedOverrides: [],
|
|
440
447
|
affects: () => true
|
|
441
448
|
};
|
|
442
449
|
|
|
@@ -476,6 +483,7 @@ describe('WorkspaceTrustService', () => {
|
|
|
476
483
|
preferenceName: WORKSPACE_TRUST_ENABLED,
|
|
477
484
|
scope: PreferenceScope.User,
|
|
478
485
|
domain: [],
|
|
486
|
+
affectedOverrides: [],
|
|
479
487
|
affects: () => true
|
|
480
488
|
};
|
|
481
489
|
|
|
@@ -492,6 +500,7 @@ describe('WorkspaceTrustService', () => {
|
|
|
492
500
|
preferenceName: WORKSPACE_TRUST_ENABLED,
|
|
493
501
|
scope: PreferenceScope.User,
|
|
494
502
|
domain: [],
|
|
503
|
+
affectedOverrides: [],
|
|
495
504
|
affects: () => true
|
|
496
505
|
};
|
|
497
506
|
|
|
@@ -511,6 +520,7 @@ describe('WorkspaceTrustService', () => {
|
|
|
511
520
|
preferenceName: WORKSPACE_TRUST_ENABLED,
|
|
512
521
|
scope: PreferenceScope.User,
|
|
513
522
|
domain: [],
|
|
523
|
+
affectedOverrides: [],
|
|
514
524
|
affects: () => true
|
|
515
525
|
};
|
|
516
526
|
|
|
@@ -531,7 +541,8 @@ describe('WorkspaceTrustService', () => {
|
|
|
531
541
|
preferenceName: WORKSPACE_TRUST_TRUSTED_FOLDERS,
|
|
532
542
|
scope: PreferenceScope.User,
|
|
533
543
|
domain: [],
|
|
534
|
-
|
|
544
|
+
affectedOverrides: [],
|
|
545
|
+
affects: () => true,
|
|
535
546
|
};
|
|
536
547
|
|
|
537
548
|
await service.testHandlePreferenceChange(change);
|
|
@@ -554,6 +565,7 @@ describe('WorkspaceTrustService', () => {
|
|
|
554
565
|
preferenceName: WORKSPACE_TRUST_TRUSTED_FOLDERS,
|
|
555
566
|
scope: PreferenceScope.User,
|
|
556
567
|
domain: [],
|
|
568
|
+
affectedOverrides: [],
|
|
557
569
|
affects: () => true
|
|
558
570
|
};
|
|
559
571
|
|
|
@@ -28,13 +28,13 @@ import { inject, injectable, named, postConstruct, preDestroy } from '@theia/cor
|
|
|
28
28
|
import { WindowService } from '@theia/core/lib/browser/window/window-service';
|
|
29
29
|
import {
|
|
30
30
|
WorkspaceTrustPreferences, WORKSPACE_TRUST_EMPTY_WINDOW, WORKSPACE_TRUST_ENABLED, WORKSPACE_TRUST_STARTUP_PROMPT, WORKSPACE_TRUST_TRUSTED_FOLDERS, WorkspaceTrustPrompt
|
|
31
|
-
} from '../common/workspace-trust-preferences';
|
|
31
|
+
} from '../common/workspace-trust-preferences.js';
|
|
32
32
|
import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
|
|
33
|
-
import { WorkspaceService } from './workspace-service';
|
|
34
|
-
import { WorkspaceCommands } from './workspace-commands';
|
|
33
|
+
import { WorkspaceService } from './workspace-service.js';
|
|
34
|
+
import { WorkspaceCommands } from './workspace-commands.js';
|
|
35
35
|
import { ContextKeyService } from '@theia/core/lib/browser/context-key-service';
|
|
36
|
-
import { WorkspaceTrustDialog } from './workspace-trust-dialog';
|
|
37
|
-
import { UntitledWorkspaceService } from '../common/untitled-workspace-service';
|
|
36
|
+
import { WorkspaceTrustDialog } from './workspace-trust-dialog.js';
|
|
37
|
+
import { UntitledWorkspaceService } from '../common/untitled-workspace-service.js';
|
|
38
38
|
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
|
|
39
39
|
|
|
40
40
|
const STORAGE_TRUSTED = 'trusted';
|
|
@@ -23,10 +23,10 @@ import { Container } from '@theia/core/shared/inversify';
|
|
|
23
23
|
import { Event } from '@theia/core/lib/common/event';
|
|
24
24
|
import { ApplicationShell, WidgetManager } from '@theia/core/lib/browser';
|
|
25
25
|
import { DefaultUriLabelProviderContribution, DidChangeLabelEvent } from '@theia/core/lib/browser/label-provider';
|
|
26
|
-
import { WorkspaceUriLabelProviderContribution } from './workspace-uri-contribution';
|
|
26
|
+
import { WorkspaceUriLabelProviderContribution } from './workspace-uri-contribution.js';
|
|
27
27
|
import URI from '@theia/core/lib/common/uri';
|
|
28
|
-
import { WorkspaceVariableContribution } from './workspace-variable-contribution';
|
|
29
|
-
import { WorkspaceService } from './workspace-service';
|
|
28
|
+
import { WorkspaceVariableContribution } from './workspace-variable-contribution.js';
|
|
29
|
+
import { WorkspaceService } from './workspace-service.js';
|
|
30
30
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
31
31
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
32
32
|
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
|
|
@@ -18,8 +18,8 @@ import { DefaultUriLabelProviderContribution, URIIconReference } from '@theia/co
|
|
|
18
18
|
import URI from '@theia/core/lib/common/uri';
|
|
19
19
|
import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
|
|
20
20
|
import { FileStat } from '@theia/filesystem/lib/common/files';
|
|
21
|
-
import { WorkspaceService } from './workspace-service';
|
|
22
|
-
import { WorkspaceVariableContribution } from './workspace-variable-contribution';
|
|
21
|
+
import { WorkspaceService } from './workspace-service.js';
|
|
22
|
+
import { WorkspaceVariableContribution } from './workspace-variable-contribution.js';
|
|
23
23
|
|
|
24
24
|
@injectable()
|
|
25
25
|
export class WorkspaceUriLabelProviderContribution extends DefaultUriLabelProviderContribution {
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { inject, injectable } from '@theia/core/shared/inversify';
|
|
18
18
|
import { UserWorkingDirectoryProvider } from '@theia/core/lib/browser/user-working-directory-provider';
|
|
19
19
|
import URI from '@theia/core/lib/common/uri';
|
|
20
|
-
import { WorkspaceService } from './workspace-service';
|
|
20
|
+
import { WorkspaceService } from './workspace-service.js';
|
|
21
21
|
import { MaybePromise } from '@theia/core';
|
|
22
22
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
23
23
|
|