@theia/workspace 1.45.1 → 1.46.0-next.72
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/README.md +30 -30
- package/lib/browser/canonical-uri-service.d.ts +11 -11
- package/lib/browser/canonical-uri-service.js +59 -59
- package/lib/browser/diff-service.d.ts +10 -10
- package/lib/browser/diff-service.js +85 -85
- package/lib/browser/index.d.ts +7 -7
- package/lib/browser/index.js +34 -34
- package/lib/browser/quick-open-workspace.d.ts +25 -25
- package/lib/browser/quick-open-workspace.js +137 -137
- package/lib/browser/untitled-workspace-exit-dialog.d.ts +19 -19
- package/lib/browser/untitled-workspace-exit-dialog.js +74 -74
- package/lib/browser/workspace-breadcrumbs-contribution.d.ts +10 -10
- package/lib/browser/workspace-breadcrumbs-contribution.js +66 -66
- package/lib/browser/workspace-commands.d.ts +117 -117
- package/lib/browser/workspace-commands.js +601 -601
- package/lib/browser/workspace-commands.spec.d.ts +1 -1
- package/lib/browser/workspace-commands.spec.js +127 -127
- package/lib/browser/workspace-compare-handler.d.ts +26 -26
- package/lib/browser/workspace-compare-handler.js +66 -66
- package/lib/browser/workspace-delete-handler.d.ts +75 -75
- package/lib/browser/workspace-delete-handler.js +214 -214
- package/lib/browser/workspace-duplicate-handler.d.ts +30 -30
- package/lib/browser/workspace-duplicate-handler.js +86 -86
- package/lib/browser/workspace-frontend-contribution.d.ts +110 -110
- package/lib/browser/workspace-frontend-contribution.js +546 -546
- package/lib/browser/workspace-frontend-contribution.js.map +1 -1
- package/lib/browser/workspace-frontend-module.d.ts +3 -3
- package/lib/browser/workspace-frontend-module.js +91 -91
- package/lib/browser/workspace-input-dialog.d.ts +19 -19
- package/lib/browser/workspace-input-dialog.js +74 -74
- package/lib/browser/workspace-preferences.d.ts +11 -11
- package/lib/browser/workspace-preferences.js +46 -46
- package/lib/browser/workspace-schema-updater.d.ts +34 -34
- package/lib/browser/workspace-schema-updater.js +153 -153
- package/lib/browser/workspace-service.d.ts +184 -184
- package/lib/browser/workspace-service.js +739 -739
- package/lib/browser/workspace-storage-service.d.ts +15 -15
- package/lib/browser/workspace-storage-service.js +80 -80
- package/lib/browser/workspace-trust-preferences.d.ts +21 -21
- package/lib/browser/workspace-trust-preferences.js +65 -65
- package/lib/browser/workspace-trust-service.d.ts +27 -27
- package/lib/browser/workspace-trust-service.js +152 -152
- package/lib/browser/workspace-uri-contribution.d.ts +20 -20
- package/lib/browser/workspace-uri-contribution.js +113 -113
- package/lib/browser/workspace-uri-contribution.spec.d.ts +1 -1
- package/lib/browser/workspace-uri-contribution.spec.js +169 -169
- package/lib/browser/workspace-user-working-directory-provider.d.ts +12 -12
- package/lib/browser/workspace-user-working-directory-provider.js +62 -62
- package/lib/browser/workspace-utils.d.ts +15 -15
- package/lib/browser/workspace-utils.js +54 -54
- package/lib/browser/workspace-variable-contribution.d.ts +23 -23
- package/lib/browser/workspace-variable-contribution.js +237 -237
- package/lib/browser/workspace-window-title-updater.d.ts +7 -7
- package/lib/browser/workspace-window-title-updater.js +57 -57
- package/lib/browser-only/browser-only-workspace-server.d.ts +13 -0
- package/lib/browser-only/browser-only-workspace-server.d.ts.map +1 -0
- package/lib/browser-only/browser-only-workspace-server.js +81 -0
- package/lib/browser-only/browser-only-workspace-server.js.map +1 -0
- package/lib/browser-only/workspace-frontend-only-module.d.ts +4 -0
- package/lib/browser-only/workspace-frontend-only-module.d.ts.map +1 -0
- package/lib/browser-only/workspace-frontend-only-module.js +30 -0
- package/lib/browser-only/workspace-frontend-only-module.js.map +1 -0
- package/lib/common/index.d.ts +3 -3
- package/lib/common/index.js +30 -30
- package/lib/common/test/mock-workspace-server.d.ts +7 -7
- package/lib/common/test/mock-workspace-server.js +35 -35
- package/lib/common/untitled-workspace-service.d.ts +8 -8
- package/lib/common/untitled-workspace-service.js +60 -60
- package/lib/common/workspace-file-service.d.ts +26 -26
- package/lib/common/workspace-file-service.js +71 -71
- package/lib/common/workspace-protocol.d.ts +26 -26
- package/lib/common/workspace-protocol.js +23 -23
- package/lib/node/default-workspace-server.d.ts +65 -65
- package/lib/node/default-workspace-server.js +248 -248
- package/lib/node/default-workspace-server.spec.d.ts +1 -1
- package/lib/node/default-workspace-server.spec.js +85 -85
- package/lib/node/index.d.ts +2 -2
- package/lib/node/index.js +29 -29
- package/lib/node/workspace-backend-module.d.ts +3 -3
- package/lib/node/workspace-backend-module.js +33 -33
- package/package.json +9 -6
- package/src/browser/canonical-uri-service.ts +57 -57
- package/src/browser/diff-service.ts +62 -62
- package/src/browser/index.ts +23 -23
- package/src/browser/quick-open-workspace.ts +112 -112
- package/src/browser/untitled-workspace-exit-dialog.ts +70 -70
- package/src/browser/workspace-breadcrumbs-contribution.ts +56 -56
- package/src/browser/workspace-commands.spec.ts +153 -153
- package/src/browser/workspace-commands.ts +588 -588
- package/src/browser/workspace-compare-handler.ts +56 -56
- package/src/browser/workspace-delete-handler.ts +212 -212
- package/src/browser/workspace-duplicate-handler.ts +75 -75
- package/src/browser/workspace-frontend-contribution.ts +537 -537
- package/src/browser/workspace-frontend-module.ts +118 -118
- package/src/browser/workspace-input-dialog.ts +61 -61
- package/src/browser/workspace-preferences.ts +58 -58
- package/src/browser/workspace-schema-updater.ts +150 -150
- package/src/browser/workspace-service.ts +780 -780
- package/src/browser/workspace-storage-service.ts +67 -67
- package/src/browser/workspace-trust-preferences.ts +76 -76
- package/src/browser/workspace-trust-service.ts +147 -147
- package/src/browser/workspace-uri-contribution.spec.ts +191 -191
- package/src/browser/workspace-uri-contribution.ts +97 -97
- package/src/browser/workspace-user-working-directory-provider.ts +49 -49
- package/src/browser/workspace-utils.ts +45 -45
- package/src/browser/workspace-variable-contribution.ts +222 -222
- package/src/browser/workspace-window-title-updater.ts +45 -45
- package/src/browser-only/browser-only-workspace-server.ts +69 -0
- package/src/browser-only/workspace-frontend-only-module.ts +28 -0
- package/src/common/index.ts +19 -19
- package/src/common/test/mock-workspace-server.ts +29 -29
- package/src/common/untitled-workspace-service.ts +50 -50
- package/src/common/workspace-file-service.ts +72 -72
- package/src/common/workspace-protocol.ts +47 -47
- package/src/node/default-workspace-server.spec.ts +100 -100
- package/src/node/default-workspace-server.ts +244 -244
- package/src/node/index.ts +18 -18
- package/src/node/workspace-backend-module.ts +38 -38
|
@@ -1,150 +1,150 @@
|
|
|
1
|
-
// *****************************************************************************
|
|
2
|
-
// Copyright (C) 2021 Ericsson and others.
|
|
3
|
-
//
|
|
4
|
-
// This program and the accompanying materials are made available under the
|
|
5
|
-
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
-
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
-
//
|
|
8
|
-
// This Source Code may also be made available under the following Secondary
|
|
9
|
-
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
-
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
-
// with the GNU Classpath Exception which is available at
|
|
12
|
-
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
-
//
|
|
14
|
-
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
-
// *****************************************************************************
|
|
16
|
-
|
|
17
|
-
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
18
|
-
import { JsonSchemaContribution, JsonSchemaRegisterContext } from '@theia/core/lib/browser/json-schema-store';
|
|
19
|
-
import { InMemoryResources, isArray, isObject } from '@theia/core/lib/common';
|
|
20
|
-
import { IJSONSchema } from '@theia/core/lib/common/json-schema';
|
|
21
|
-
import URI from '@theia/core/lib/common/uri';
|
|
22
|
-
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
23
|
-
import { WorkspaceFileService } from '../common';
|
|
24
|
-
|
|
25
|
-
export interface SchemaUpdateMessage {
|
|
26
|
-
key: string,
|
|
27
|
-
schema?: IJSONSchema,
|
|
28
|
-
deferred: Deferred<boolean>;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
export namespace AddKeyMessage {
|
|
32
|
-
export const is = (message: SchemaUpdateMessage | undefined): message is Required<SchemaUpdateMessage> => !!message && message.schema !== undefined;
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
@injectable()
|
|
36
|
-
export class WorkspaceSchemaUpdater implements JsonSchemaContribution {
|
|
37
|
-
|
|
38
|
-
protected readonly uri = new URI(workspaceSchemaId);
|
|
39
|
-
protected readonly editQueue: SchemaUpdateMessage[] = [];
|
|
40
|
-
protected safeToHandleQueue = new Deferred();
|
|
41
|
-
|
|
42
|
-
@inject(InMemoryResources) protected readonly inmemoryResources: InMemoryResources;
|
|
43
|
-
@inject(WorkspaceFileService) protected readonly workspaceFileService: WorkspaceFileService;
|
|
44
|
-
|
|
45
|
-
@postConstruct()
|
|
46
|
-
protected init(): void {
|
|
47
|
-
this.inmemoryResources.add(this.uri, JSON.stringify(workspaceSchema));
|
|
48
|
-
this.safeToHandleQueue.resolve();
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
registerSchemas(context: JsonSchemaRegisterContext): void {
|
|
52
|
-
context.registerSchema({
|
|
53
|
-
fileMatch: this.workspaceFileService.getWorkspaceFileExtensions(true),
|
|
54
|
-
url: this.uri.toString()
|
|
55
|
-
});
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
protected async retrieveCurrent(): Promise<WorkspaceSchema> {
|
|
59
|
-
const current = await this.inmemoryResources.resolve(this.uri).readContents();
|
|
60
|
-
|
|
61
|
-
const content = JSON.parse(current);
|
|
62
|
-
|
|
63
|
-
if (!WorkspaceSchema.is(content)) {
|
|
64
|
-
throw new Error('Failed to retrieve current workspace schema.');
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
return content;
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
async updateSchema(message: Omit<SchemaUpdateMessage, 'deferred'>): Promise<boolean> {
|
|
71
|
-
const doHandle = this.editQueue.length === 0;
|
|
72
|
-
const deferred = new Deferred<boolean>();
|
|
73
|
-
this.editQueue.push({ ...message, deferred });
|
|
74
|
-
if (doHandle) {
|
|
75
|
-
this.handleQueue();
|
|
76
|
-
}
|
|
77
|
-
return deferred.promise;
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
protected async handleQueue(): Promise<void> {
|
|
81
|
-
await this.safeToHandleQueue.promise;
|
|
82
|
-
this.safeToHandleQueue = new Deferred();
|
|
83
|
-
const cache = await this.retrieveCurrent();
|
|
84
|
-
while (this.editQueue.length) {
|
|
85
|
-
const nextMessage = this.editQueue.shift();
|
|
86
|
-
if (AddKeyMessage.is(nextMessage)) {
|
|
87
|
-
this.addKey(nextMessage, cache);
|
|
88
|
-
} else if (nextMessage) {
|
|
89
|
-
this.removeKey(nextMessage, cache);
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
this.inmemoryResources.update(this.uri, JSON.stringify(cache));
|
|
93
|
-
this.safeToHandleQueue.resolve();
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
protected addKey({ key, schema, deferred }: Required<SchemaUpdateMessage>, cache: WorkspaceSchema): void {
|
|
97
|
-
if (key in cache.properties) {
|
|
98
|
-
return deferred.resolve(false);
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
cache.properties[key] = schema;
|
|
102
|
-
deferred.resolve(true);
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
protected removeKey({ key, deferred }: SchemaUpdateMessage, cache: WorkspaceSchema): void {
|
|
106
|
-
const canDelete = !cache.required.includes(key);
|
|
107
|
-
if (!canDelete) {
|
|
108
|
-
return deferred.resolve(false);
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
const keyPresent = delete cache.properties[key];
|
|
112
|
-
deferred.resolve(keyPresent);
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
|
|
116
|
-
export type WorkspaceSchema = Required<Pick<IJSONSchema, 'properties' | 'required'>>;
|
|
117
|
-
|
|
118
|
-
export namespace WorkspaceSchema {
|
|
119
|
-
export function is(candidate: unknown): candidate is WorkspaceSchema {
|
|
120
|
-
return isObject<WorkspaceSchema>(candidate)
|
|
121
|
-
&& typeof candidate.properties === 'object'
|
|
122
|
-
&& isArray(candidate.required);
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
|
|
126
|
-
export const workspaceSchemaId = 'vscode://schemas/workspace';
|
|
127
|
-
export const workspaceSchema: IJSONSchema = {
|
|
128
|
-
$id: workspaceSchemaId,
|
|
129
|
-
type: 'object',
|
|
130
|
-
title: 'Workspace File',
|
|
131
|
-
required: ['folders'],
|
|
132
|
-
default: { folders: [{ path: '' }], settings: {} },
|
|
133
|
-
properties: {
|
|
134
|
-
folders: {
|
|
135
|
-
description: 'Root folders in the workspace',
|
|
136
|
-
type: 'array',
|
|
137
|
-
items: {
|
|
138
|
-
type: 'object',
|
|
139
|
-
properties: {
|
|
140
|
-
path: {
|
|
141
|
-
type: 'string',
|
|
142
|
-
}
|
|
143
|
-
},
|
|
144
|
-
required: ['path']
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
},
|
|
148
|
-
allowComments: true,
|
|
149
|
-
allowTrailingCommas: true,
|
|
150
|
-
};
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2021 Ericsson and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
|
|
17
|
+
import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
|
|
18
|
+
import { JsonSchemaContribution, JsonSchemaRegisterContext } from '@theia/core/lib/browser/json-schema-store';
|
|
19
|
+
import { InMemoryResources, isArray, isObject } from '@theia/core/lib/common';
|
|
20
|
+
import { IJSONSchema } from '@theia/core/lib/common/json-schema';
|
|
21
|
+
import URI from '@theia/core/lib/common/uri';
|
|
22
|
+
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
23
|
+
import { WorkspaceFileService } from '../common';
|
|
24
|
+
|
|
25
|
+
export interface SchemaUpdateMessage {
|
|
26
|
+
key: string,
|
|
27
|
+
schema?: IJSONSchema,
|
|
28
|
+
deferred: Deferred<boolean>;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export namespace AddKeyMessage {
|
|
32
|
+
export const is = (message: SchemaUpdateMessage | undefined): message is Required<SchemaUpdateMessage> => !!message && message.schema !== undefined;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
@injectable()
|
|
36
|
+
export class WorkspaceSchemaUpdater implements JsonSchemaContribution {
|
|
37
|
+
|
|
38
|
+
protected readonly uri = new URI(workspaceSchemaId);
|
|
39
|
+
protected readonly editQueue: SchemaUpdateMessage[] = [];
|
|
40
|
+
protected safeToHandleQueue = new Deferred();
|
|
41
|
+
|
|
42
|
+
@inject(InMemoryResources) protected readonly inmemoryResources: InMemoryResources;
|
|
43
|
+
@inject(WorkspaceFileService) protected readonly workspaceFileService: WorkspaceFileService;
|
|
44
|
+
|
|
45
|
+
@postConstruct()
|
|
46
|
+
protected init(): void {
|
|
47
|
+
this.inmemoryResources.add(this.uri, JSON.stringify(workspaceSchema));
|
|
48
|
+
this.safeToHandleQueue.resolve();
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
registerSchemas(context: JsonSchemaRegisterContext): void {
|
|
52
|
+
context.registerSchema({
|
|
53
|
+
fileMatch: this.workspaceFileService.getWorkspaceFileExtensions(true),
|
|
54
|
+
url: this.uri.toString()
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
protected async retrieveCurrent(): Promise<WorkspaceSchema> {
|
|
59
|
+
const current = await this.inmemoryResources.resolve(this.uri).readContents();
|
|
60
|
+
|
|
61
|
+
const content = JSON.parse(current);
|
|
62
|
+
|
|
63
|
+
if (!WorkspaceSchema.is(content)) {
|
|
64
|
+
throw new Error('Failed to retrieve current workspace schema.');
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
return content;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
async updateSchema(message: Omit<SchemaUpdateMessage, 'deferred'>): Promise<boolean> {
|
|
71
|
+
const doHandle = this.editQueue.length === 0;
|
|
72
|
+
const deferred = new Deferred<boolean>();
|
|
73
|
+
this.editQueue.push({ ...message, deferred });
|
|
74
|
+
if (doHandle) {
|
|
75
|
+
this.handleQueue();
|
|
76
|
+
}
|
|
77
|
+
return deferred.promise;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
protected async handleQueue(): Promise<void> {
|
|
81
|
+
await this.safeToHandleQueue.promise;
|
|
82
|
+
this.safeToHandleQueue = new Deferred();
|
|
83
|
+
const cache = await this.retrieveCurrent();
|
|
84
|
+
while (this.editQueue.length) {
|
|
85
|
+
const nextMessage = this.editQueue.shift();
|
|
86
|
+
if (AddKeyMessage.is(nextMessage)) {
|
|
87
|
+
this.addKey(nextMessage, cache);
|
|
88
|
+
} else if (nextMessage) {
|
|
89
|
+
this.removeKey(nextMessage, cache);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
this.inmemoryResources.update(this.uri, JSON.stringify(cache));
|
|
93
|
+
this.safeToHandleQueue.resolve();
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
protected addKey({ key, schema, deferred }: Required<SchemaUpdateMessage>, cache: WorkspaceSchema): void {
|
|
97
|
+
if (key in cache.properties) {
|
|
98
|
+
return deferred.resolve(false);
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
cache.properties[key] = schema;
|
|
102
|
+
deferred.resolve(true);
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
protected removeKey({ key, deferred }: SchemaUpdateMessage, cache: WorkspaceSchema): void {
|
|
106
|
+
const canDelete = !cache.required.includes(key);
|
|
107
|
+
if (!canDelete) {
|
|
108
|
+
return deferred.resolve(false);
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
const keyPresent = delete cache.properties[key];
|
|
112
|
+
deferred.resolve(keyPresent);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
export type WorkspaceSchema = Required<Pick<IJSONSchema, 'properties' | 'required'>>;
|
|
117
|
+
|
|
118
|
+
export namespace WorkspaceSchema {
|
|
119
|
+
export function is(candidate: unknown): candidate is WorkspaceSchema {
|
|
120
|
+
return isObject<WorkspaceSchema>(candidate)
|
|
121
|
+
&& typeof candidate.properties === 'object'
|
|
122
|
+
&& isArray(candidate.required);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
export const workspaceSchemaId = 'vscode://schemas/workspace';
|
|
127
|
+
export const workspaceSchema: IJSONSchema = {
|
|
128
|
+
$id: workspaceSchemaId,
|
|
129
|
+
type: 'object',
|
|
130
|
+
title: 'Workspace File',
|
|
131
|
+
required: ['folders'],
|
|
132
|
+
default: { folders: [{ path: '' }], settings: {} },
|
|
133
|
+
properties: {
|
|
134
|
+
folders: {
|
|
135
|
+
description: 'Root folders in the workspace',
|
|
136
|
+
type: 'array',
|
|
137
|
+
items: {
|
|
138
|
+
type: 'object',
|
|
139
|
+
properties: {
|
|
140
|
+
path: {
|
|
141
|
+
type: 'string',
|
|
142
|
+
}
|
|
143
|
+
},
|
|
144
|
+
required: ['path']
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
},
|
|
148
|
+
allowComments: true,
|
|
149
|
+
allowTrailingCommas: true,
|
|
150
|
+
};
|