@theia/workspace 1.77.0-next.1 → 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
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2017 TypeFox and others.
|
|
4
3
|
//
|
|
@@ -14,23 +13,21 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const
|
|
29
|
-
const core_1 = require("@theia/core");
|
|
30
|
-
exports.WorkspaceHandlerContribution = Symbol('workspaceHandlerContribution');
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import * as path from 'path';
|
|
18
|
+
import * as fs from '@theia/core/shared/fs-extra';
|
|
19
|
+
import * as jsoncparser from 'jsonc-parser';
|
|
20
|
+
import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
|
|
21
|
+
import { FileUri } from '@theia/core/lib/node';
|
|
22
|
+
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
23
|
+
import { UntitledWorkspaceService } from '../common/index.js';
|
|
24
|
+
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
|
|
25
|
+
import URI from '@theia/core/lib/common/uri';
|
|
26
|
+
import { ContributionProvider, notEmpty } from '@theia/core';
|
|
27
|
+
export const WorkspaceHandlerContribution = Symbol('workspaceHandlerContribution');
|
|
31
28
|
let WorkspaceCliContribution = class WorkspaceCliContribution {
|
|
32
29
|
constructor() {
|
|
33
|
-
this.workspaceRoot = new
|
|
30
|
+
this.workspaceRoot = new Deferred();
|
|
34
31
|
}
|
|
35
32
|
configure(conf) {
|
|
36
33
|
conf.usage('$0 [workspace-directories] [options]');
|
|
@@ -63,7 +60,7 @@ let WorkspaceCliContribution = class WorkspaceCliContribution {
|
|
|
63
60
|
if (folders.length < 2) {
|
|
64
61
|
return folders[0]?.path;
|
|
65
62
|
}
|
|
66
|
-
const untitledWorkspaceUri = await this.untitledWorkspaceService.getUntitledWorkspaceUri(new
|
|
63
|
+
const untitledWorkspaceUri = await this.untitledWorkspaceService.getUntitledWorkspaceUri(new URI(await this.envVariablesServer.getConfigDirUri()), async (uri) => !await fs.pathExists(uri.path.fsPath()));
|
|
67
64
|
const untitledWorkspacePath = untitledWorkspaceUri.path.fsPath();
|
|
68
65
|
await fs.ensureDir(path.dirname(untitledWorkspacePath));
|
|
69
66
|
await fs.writeFile(untitledWorkspacePath, JSON.stringify({ folders }, undefined, 4));
|
|
@@ -74,21 +71,19 @@ let WorkspaceCliContribution = class WorkspaceCliContribution {
|
|
|
74
71
|
}
|
|
75
72
|
}
|
|
76
73
|
};
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
(0, inversify_1.inject)(env_variables_1.EnvVariablesServer),
|
|
80
|
-
tslib_1.__metadata("design:type", Object)
|
|
74
|
+
__decorate([
|
|
75
|
+
inject(EnvVariablesServer)
|
|
81
76
|
], WorkspaceCliContribution.prototype, "envVariablesServer", void 0);
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
tslib_1.__metadata("design:type", common_1.UntitledWorkspaceService)
|
|
77
|
+
__decorate([
|
|
78
|
+
inject(UntitledWorkspaceService)
|
|
85
79
|
], WorkspaceCliContribution.prototype, "untitledWorkspaceService", void 0);
|
|
86
|
-
|
|
87
|
-
|
|
80
|
+
WorkspaceCliContribution = __decorate([
|
|
81
|
+
injectable()
|
|
88
82
|
], WorkspaceCliContribution);
|
|
83
|
+
export { WorkspaceCliContribution };
|
|
89
84
|
let DefaultWorkspaceServer = class DefaultWorkspaceServer {
|
|
90
85
|
constructor() {
|
|
91
|
-
this.root = new
|
|
86
|
+
this.root = new Deferred();
|
|
92
87
|
/**
|
|
93
88
|
* Untitled workspaces that are not among the most recent N workspaces will be deleted on start. Increase this number to keep older files,
|
|
94
89
|
* lower it to delete stale untitled workspaces more aggressively.
|
|
@@ -119,14 +114,14 @@ let DefaultWorkspaceServer = class DefaultWorkspaceServer {
|
|
|
119
114
|
return this.root.promise;
|
|
120
115
|
}
|
|
121
116
|
async setMostRecentlyUsedWorkspace(rawUri) {
|
|
122
|
-
const uri = rawUri && new
|
|
123
|
-
this.root = new
|
|
117
|
+
const uri = rawUri && new URI(rawUri).toString(); // the empty string is used as a signal from the frontend not to load a workspace.
|
|
118
|
+
this.root = new Deferred();
|
|
124
119
|
this.root.resolve(uri);
|
|
125
120
|
const recentRoots = Array.from(new Set([uri, ...await this.getRecentWorkspaces()]));
|
|
126
121
|
this.writeToUserHome({ recentRoots });
|
|
127
122
|
}
|
|
128
123
|
async removeRecentWorkspace(rawUri) {
|
|
129
|
-
const uri = rawUri && new
|
|
124
|
+
const uri = rawUri && new URI(rawUri).toString(); // the empty string is used as a signal from the frontend not to load a workspace.
|
|
130
125
|
const recentRoots = await this.getRecentWorkspaces();
|
|
131
126
|
const index = recentRoots.indexOf(uri);
|
|
132
127
|
if (index !== -1) {
|
|
@@ -140,12 +135,12 @@ let DefaultWorkspaceServer = class DefaultWorkspaceServer {
|
|
|
140
135
|
const data = await this.readRecentWorkspacePathsFromUserHome();
|
|
141
136
|
if (data && data.recentRoots) {
|
|
142
137
|
const allRootUris = await Promise.all(data.recentRoots.map(async (element) => element && await this.workspaceStillExist(element) ? element : undefined));
|
|
143
|
-
return allRootUris.filter(
|
|
138
|
+
return allRootUris.filter(notEmpty);
|
|
144
139
|
}
|
|
145
140
|
return [];
|
|
146
141
|
}
|
|
147
142
|
async workspaceStillExist(workspaceRootUri) {
|
|
148
|
-
const uri = new
|
|
143
|
+
const uri = new URI(workspaceRootUri);
|
|
149
144
|
for (const handler of this.workspaceHandlers.getContributions()) {
|
|
150
145
|
if (handler.canHandle(uri)) {
|
|
151
146
|
return handler.workspaceStillExists(uri);
|
|
@@ -155,7 +150,7 @@ let DefaultWorkspaceServer = class DefaultWorkspaceServer {
|
|
|
155
150
|
}
|
|
156
151
|
async getWorkspaceURIFromCli() {
|
|
157
152
|
const arg = await this.cliParams.workspaceRoot.promise;
|
|
158
|
-
return arg !== undefined ?
|
|
153
|
+
return arg !== undefined ? FileUri.create(arg).toString() : undefined;
|
|
159
154
|
}
|
|
160
155
|
/**
|
|
161
156
|
* Writes the given uri as the most recently used workspace root to the user's home directory.
|
|
@@ -188,50 +183,43 @@ let DefaultWorkspaceServer = class DefaultWorkspaceServer {
|
|
|
188
183
|
}
|
|
189
184
|
async getUserStoragePath() {
|
|
190
185
|
const configDirUri = await this.envServer.getConfigDirUri();
|
|
191
|
-
return path.resolve(
|
|
186
|
+
return path.resolve(FileUri.fsPath(configDirUri), 'recentworkspace.json');
|
|
192
187
|
}
|
|
193
188
|
/**
|
|
194
189
|
* Removes untitled workspaces that are not among the most recently used workspaces.
|
|
195
190
|
* Use the `untitledWorkspaceStaleThreshold` to configure when to delete workspaces.
|
|
196
191
|
*/
|
|
197
192
|
async removeOldUntitledWorkspaces() {
|
|
198
|
-
const recents = (await this.getRecentWorkspaces()).map(
|
|
193
|
+
const recents = (await this.getRecentWorkspaces()).map(FileUri.fsPath);
|
|
199
194
|
const olderUntitledWorkspaces = recents
|
|
200
195
|
.slice(this.untitledWorkspaceStaleThreshold)
|
|
201
|
-
.filter(workspace => this.untitledWorkspaceService.isUntitledWorkspace(
|
|
202
|
-
await Promise.all(olderUntitledWorkspaces.map(workspace => fs.promises.unlink(
|
|
196
|
+
.filter(workspace => this.untitledWorkspaceService.isUntitledWorkspace(FileUri.create(workspace)));
|
|
197
|
+
await Promise.all(olderUntitledWorkspaces.map(workspace => fs.promises.unlink(FileUri.fsPath(workspace)).catch(() => { })));
|
|
203
198
|
if (olderUntitledWorkspaces.length > 0) {
|
|
204
199
|
await this.writeToUserHome({ recentRoots: await this.getRecentWorkspaces() });
|
|
205
200
|
}
|
|
206
201
|
}
|
|
207
202
|
};
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
(0, inversify_1.inject)(WorkspaceCliContribution),
|
|
211
|
-
tslib_1.__metadata("design:type", WorkspaceCliContribution)
|
|
203
|
+
__decorate([
|
|
204
|
+
inject(WorkspaceCliContribution)
|
|
212
205
|
], DefaultWorkspaceServer.prototype, "cliParams", void 0);
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
tslib_1.__metadata("design:type", Object)
|
|
206
|
+
__decorate([
|
|
207
|
+
inject(EnvVariablesServer)
|
|
216
208
|
], DefaultWorkspaceServer.prototype, "envServer", void 0);
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
tslib_1.__metadata("design:type", common_1.UntitledWorkspaceService)
|
|
209
|
+
__decorate([
|
|
210
|
+
inject(UntitledWorkspaceService)
|
|
220
211
|
], DefaultWorkspaceServer.prototype, "untitledWorkspaceService", void 0);
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
tslib_1.__metadata("design:type", Object)
|
|
212
|
+
__decorate([
|
|
213
|
+
inject(ContributionProvider),
|
|
214
|
+
named(WorkspaceHandlerContribution)
|
|
225
215
|
], DefaultWorkspaceServer.prototype, "workspaceHandlers", void 0);
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
tslib_1.__metadata("design:type", Function),
|
|
229
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
230
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
216
|
+
__decorate([
|
|
217
|
+
postConstruct()
|
|
231
218
|
], DefaultWorkspaceServer.prototype, "init", null);
|
|
232
|
-
|
|
233
|
-
|
|
219
|
+
DefaultWorkspaceServer = __decorate([
|
|
220
|
+
injectable()
|
|
234
221
|
], DefaultWorkspaceServer);
|
|
222
|
+
export { DefaultWorkspaceServer };
|
|
235
223
|
let FileWorkspaceHandlerContribution = class FileWorkspaceHandlerContribution {
|
|
236
224
|
canHandle(uri) {
|
|
237
225
|
return uri.scheme === 'file';
|
|
@@ -240,11 +228,11 @@ let FileWorkspaceHandlerContribution = class FileWorkspaceHandlerContribution {
|
|
|
240
228
|
return fs.pathExists(uri.path.fsPath());
|
|
241
229
|
}
|
|
242
230
|
};
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
(0, inversify_1.injectable)()
|
|
231
|
+
FileWorkspaceHandlerContribution = __decorate([
|
|
232
|
+
injectable()
|
|
246
233
|
], FileWorkspaceHandlerContribution);
|
|
247
|
-
|
|
234
|
+
export { FileWorkspaceHandlerContribution };
|
|
235
|
+
export var RecentWorkspacePathsData;
|
|
248
236
|
(function (RecentWorkspacePathsData) {
|
|
249
237
|
/**
|
|
250
238
|
* Parses `data` as `RecentWorkspacePathsData` but removes any non-string array entry.
|
|
@@ -260,5 +248,5 @@ var RecentWorkspacePathsData;
|
|
|
260
248
|
};
|
|
261
249
|
}
|
|
262
250
|
RecentWorkspacePathsData.create = create;
|
|
263
|
-
})(RecentWorkspacePathsData || (
|
|
251
|
+
})(RecentWorkspacePathsData || (RecentWorkspacePathsData = {}));
|
|
264
252
|
//# sourceMappingURL=default-workspace-server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-workspace-server.js","sourceRoot":"","sources":["../../src/node/default-workspace-server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"default-workspace-server.js","sourceRoot":"","sources":["../../src/node/default-workspace-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2022 Alexander Flammer and others.
|
|
4
3
|
//
|
|
@@ -14,18 +13,17 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
const mock_logger_1 = require("@theia/core/lib/common/test/mock-logger");
|
|
16
|
+
import { Container, ContainerModule } from '@theia/core/shared/inversify';
|
|
17
|
+
import { MockEnvVariablesServerImpl } from '@theia/core/lib/browser/test/mock-env-variables-server';
|
|
18
|
+
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
|
|
19
|
+
import { FileUri } from '@theia/core/lib/node';
|
|
20
|
+
import { WorkspaceFileService, UntitledWorkspaceService } from '../common/index.js';
|
|
21
|
+
import { DefaultWorkspaceServer, FileWorkspaceHandlerContribution, WorkspaceCliContribution, WorkspaceHandlerContribution } from './default-workspace-server.js';
|
|
22
|
+
import { expect } from 'chai';
|
|
23
|
+
import * as temp from 'temp';
|
|
24
|
+
import * as fs from 'fs';
|
|
25
|
+
import { ILogger, bindContributionProvider } from '@theia/core';
|
|
26
|
+
import { MockLogger } from '@theia/core/lib/common/test/mock-logger';
|
|
29
27
|
describe('DefaultWorkspaceServer', function () {
|
|
30
28
|
describe('getRecentWorkspaces()', async () => {
|
|
31
29
|
let workspaceServer;
|
|
@@ -34,28 +32,28 @@ describe('DefaultWorkspaceServer', function () {
|
|
|
34
32
|
beforeEach(() => {
|
|
35
33
|
// create a temporary directory
|
|
36
34
|
const tempDirPath = temp.track().mkdirSync();
|
|
37
|
-
tmpConfigDir =
|
|
38
|
-
recentWorkspaceFile =
|
|
35
|
+
tmpConfigDir = FileUri.create(fs.realpathSync(tempDirPath));
|
|
36
|
+
recentWorkspaceFile = FileUri.fsPath(tmpConfigDir.resolve('recentworkspace.json'));
|
|
39
37
|
// create a container with the necessary bindings for the DefaultWorkspaceServer
|
|
40
|
-
const container = new
|
|
41
|
-
const containerModule = new
|
|
38
|
+
const container = new Container();
|
|
39
|
+
const containerModule = new ContainerModule(bind => {
|
|
42
40
|
/* Mock logger binding*/
|
|
43
|
-
bind(
|
|
44
|
-
|
|
45
|
-
bind(
|
|
46
|
-
bind(
|
|
47
|
-
bind(
|
|
48
|
-
bind(
|
|
49
|
-
bind(
|
|
50
|
-
bind(
|
|
51
|
-
bind(
|
|
41
|
+
bind(ILogger).to(MockLogger);
|
|
42
|
+
bindContributionProvider(bind, WorkspaceHandlerContribution);
|
|
43
|
+
bind(FileWorkspaceHandlerContribution).toSelf().inSingletonScope();
|
|
44
|
+
bind(WorkspaceHandlerContribution).toService(FileWorkspaceHandlerContribution);
|
|
45
|
+
bind(WorkspaceCliContribution).toSelf().inSingletonScope();
|
|
46
|
+
bind(DefaultWorkspaceServer).toSelf().inSingletonScope();
|
|
47
|
+
bind(WorkspaceFileService).toSelf().inSingletonScope();
|
|
48
|
+
bind(UntitledWorkspaceService).toSelf().inSingletonScope();
|
|
49
|
+
bind(EnvVariablesServer).toConstantValue(new MockEnvVariablesServerImpl(tmpConfigDir));
|
|
52
50
|
});
|
|
53
51
|
container.load(containerModule);
|
|
54
|
-
workspaceServer = container.get(
|
|
52
|
+
workspaceServer = container.get(DefaultWorkspaceServer);
|
|
55
53
|
});
|
|
56
54
|
it('should return empty list of workspaces if no recent workspaces file is existing', async function () {
|
|
57
55
|
const recent = await workspaceServer.getRecentWorkspaces();
|
|
58
|
-
|
|
56
|
+
expect(recent).to.be.empty;
|
|
59
57
|
});
|
|
60
58
|
it('should not return non-existing workspaces from recent workspaces file', async function () {
|
|
61
59
|
fs.writeFileSync(recentWorkspaceFile, JSON.stringify({
|
|
@@ -65,7 +63,7 @@ describe('DefaultWorkspaceServer', function () {
|
|
|
65
63
|
]
|
|
66
64
|
}));
|
|
67
65
|
const recent = await workspaceServer.getRecentWorkspaces();
|
|
68
|
-
|
|
66
|
+
expect(recent).to.be.empty;
|
|
69
67
|
});
|
|
70
68
|
it('should return only existing workspaces from recent workspaces file', async function () {
|
|
71
69
|
fs.writeFileSync(recentWorkspaceFile, JSON.stringify({
|
|
@@ -75,7 +73,7 @@ describe('DefaultWorkspaceServer', function () {
|
|
|
75
73
|
]
|
|
76
74
|
}));
|
|
77
75
|
const recent = await workspaceServer.getRecentWorkspaces();
|
|
78
|
-
|
|
76
|
+
expect(recent).to.have.members([tmpConfigDir.toString()]);
|
|
79
77
|
});
|
|
80
78
|
it('should ignore non-string array entries but return remaining existing file paths', async function () {
|
|
81
79
|
// previously caused: 'TypeError: Cannot read property 'fsPath' of undefined', see issue #10250
|
|
@@ -89,7 +87,7 @@ describe('DefaultWorkspaceServer', function () {
|
|
|
89
87
|
]
|
|
90
88
|
}));
|
|
91
89
|
const recent = await workspaceServer.getRecentWorkspaces();
|
|
92
|
-
|
|
90
|
+
expect(recent).to.have.members([tmpConfigDir.toString()]);
|
|
93
91
|
});
|
|
94
92
|
});
|
|
95
93
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-workspace-server.spec.js","sourceRoot":"","sources":["../../src/node/default-workspace-server.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"default-workspace-server.spec.js","sourceRoot":"","sources":["../../src/node/default-workspace-server.spec.ts"],"names":[],"mappings":"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"}
|
package/lib/node/index.d.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export * from './default-workspace-server';
|
|
2
|
-
export * from './workspace-backend-module';
|
|
1
|
+
export * from './default-workspace-server.js';
|
|
2
|
+
export * from './workspace-backend-module.js';
|
|
3
3
|
//# sourceMappingURL=index.d.ts.map
|
package/lib/node/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAgBA,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAgBA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC"}
|
package/lib/node/index.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2017 TypeFox and others.
|
|
4
3
|
//
|
|
@@ -14,8 +13,6 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
tslib_1.__exportStar(require("./default-workspace-server"), exports);
|
|
20
|
-
tslib_1.__exportStar(require("./workspace-backend-module"), exports);
|
|
16
|
+
export * from './default-workspace-server.js';
|
|
17
|
+
export * from './workspace-backend-module.js';
|
|
21
18
|
//# sourceMappingURL=index.js.map
|
package/lib/node/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/node/index.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2017 TypeFox and others.
|
|
4
3
|
//
|
|
@@ -14,27 +13,26 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
bind(
|
|
27
|
-
bind(
|
|
28
|
-
bind(
|
|
29
|
-
bind(
|
|
30
|
-
bind(
|
|
31
|
-
bind(
|
|
32
|
-
bind
|
|
33
|
-
(
|
|
34
|
-
bind(
|
|
35
|
-
bind(
|
|
36
|
-
bind
|
|
37
|
-
(
|
|
38
|
-
(0, workspace_trust_preferences_1.bindWorkspaceTrustPreferences)(bind);
|
|
16
|
+
import { ContainerModule } from '@theia/core/shared/inversify';
|
|
17
|
+
import { ConnectionHandler, RpcConnectionHandler, bindRootContributionProvider } from '@theia/core/lib/common';
|
|
18
|
+
import { WorkspaceServer, workspacePath, UntitledWorkspaceService, WorkspaceFileService, bindWorkspacePreferences } from '../common/index.js';
|
|
19
|
+
import { DefaultWorkspaceServer, FileWorkspaceHandlerContribution, WorkspaceCliContribution, WorkspaceHandlerContribution } from './default-workspace-server.js';
|
|
20
|
+
import { CliContribution } from '@theia/core/lib/node/cli';
|
|
21
|
+
import { BackendApplicationContribution } from '@theia/core/lib/node';
|
|
22
|
+
import { bindWorkspaceTrustPreferences } from '../common/workspace-trust-preferences.js';
|
|
23
|
+
export default new ContainerModule(bind => {
|
|
24
|
+
bind(WorkspaceCliContribution).toSelf().inSingletonScope();
|
|
25
|
+
bind(CliContribution).toService(WorkspaceCliContribution);
|
|
26
|
+
bind(DefaultWorkspaceServer).toSelf().inSingletonScope();
|
|
27
|
+
bind(WorkspaceServer).toService(DefaultWorkspaceServer);
|
|
28
|
+
bind(BackendApplicationContribution).toService(WorkspaceServer);
|
|
29
|
+
bind(UntitledWorkspaceService).toSelf().inSingletonScope();
|
|
30
|
+
bind(WorkspaceFileService).toSelf().inSingletonScope();
|
|
31
|
+
bindRootContributionProvider(bind, WorkspaceHandlerContribution);
|
|
32
|
+
bind(FileWorkspaceHandlerContribution).toSelf().inSingletonScope();
|
|
33
|
+
bind(WorkspaceHandlerContribution).toService(FileWorkspaceHandlerContribution);
|
|
34
|
+
bind(ConnectionHandler).toDynamicValue(ctx => new RpcConnectionHandler(workspacePath, () => ctx.container.get(WorkspaceServer))).inSingletonScope();
|
|
35
|
+
bindWorkspacePreferences(bind);
|
|
36
|
+
bindWorkspaceTrustPreferences(bind);
|
|
39
37
|
});
|
|
40
38
|
//# sourceMappingURL=workspace-backend-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-backend-module.js","sourceRoot":"","sources":["../../src/node/workspace-backend-module.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"workspace-backend-module.js","sourceRoot":"","sources":["../../src/node/workspace-backend-module.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAEhF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAC/G,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAC9I,OAAO,EAAE,sBAAsB,EAAE,gCAAgC,EAAE,wBAAwB,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AACjK,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AAEzF,eAAe,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;IACtC,IAAI,CAAC,wBAAwB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3D,IAAI,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;IAC1D,IAAI,CAAC,sBAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,eAAe,CAAC,CAAC,SAAS,CAAC,sBAAsB,CAAC,CAAC;IACxD,IAAI,CAAC,8BAA8B,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;IAChE,IAAI,CAAC,wBAAwB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3D,IAAI,CAAC,oBAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAEvD,4BAA4B,CAAC,IAAI,EAAE,4BAA4B,CAAC,CAAC;IAEjE,IAAI,CAAC,gCAAgC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACnE,IAAI,CAAC,4BAA4B,CAAC,CAAC,SAAS,CAAC,gCAAgC,CAAC,CAAC;IAE/E,IAAI,CAAC,iBAAiB,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CACzC,IAAI,oBAAoB,CAAC,aAAa,EAAE,GAAG,EAAE,CACzC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CACrC,CACJ,CAAC,gBAAgB,EAAE,CAAC;IACrB,wBAAwB,CAAC,IAAI,CAAC,CAAC;IAC/B,6BAA6B,CAAC,IAAI,CAAC,CAAC;AACxC,CAAC,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/workspace",
|
|
3
|
-
"version": "1.77.0-next.
|
|
3
|
+
"version": "1.77.0-next.101+8308c936b",
|
|
4
4
|
"description": "Theia - Workspace Extension",
|
|
5
|
+
"type": "module",
|
|
5
6
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.77.0-next.
|
|
7
|
-
"@theia/filesystem": "1.77.0-next.
|
|
8
|
-
"@theia/variable-resolver": "1.77.0-next.
|
|
7
|
+
"@theia/core": "1.77.0-next.101+8308c936b",
|
|
8
|
+
"@theia/filesystem": "1.77.0-next.101+8308c936b",
|
|
9
|
+
"@theia/variable-resolver": "1.77.0-next.101+8308c936b",
|
|
9
10
|
"jsonc-parser": "^3.3.1",
|
|
10
11
|
"tslib": "^2.8.1",
|
|
11
12
|
"valid-filename": "^2.0.1"
|
|
@@ -55,5 +56,16 @@
|
|
|
55
56
|
"nyc": {
|
|
56
57
|
"extends": "../../configs/nyc.json"
|
|
57
58
|
},
|
|
58
|
-
"gitHead": "
|
|
59
|
+
"gitHead": "8308c936be596c357a51fc815ef30022aa62b3d5",
|
|
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
|
}
|