@theia/core 1.27.0-next.65 → 1.27.0-next.68
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
CHANGED
|
@@ -86,12 +86,12 @@ export class SomeClass {
|
|
|
86
86
|
- `@phosphor/signaling` (from [`@phosphor/signaling@1`](https://www.npmjs.com/package/@phosphor/signaling))
|
|
87
87
|
- `@phosphor/virtualdom` (from [`@phosphor/virtualdom@1`](https://www.npmjs.com/package/@phosphor/virtualdom))
|
|
88
88
|
- `@phosphor/widgets` (from [`@phosphor/widgets@1`](https://www.npmjs.com/package/@phosphor/widgets))
|
|
89
|
-
- `@theia/application-package` (from [`@theia/application-package@1.27.0-next.
|
|
90
|
-
- `@theia/application-package/lib/api` (from [`@theia/application-package@1.27.0-next.
|
|
91
|
-
- `@theia/application-package/lib/environment` (from [`@theia/application-package@1.27.0-next.
|
|
92
|
-
- `@theia/request` (from [`@theia/request@1.27.0-next.
|
|
93
|
-
- `@theia/request/lib/proxy` (from [`@theia/request@1.27.0-next.
|
|
94
|
-
- `@theia/request/lib/node-request-service` (from [`@theia/request@1.27.0-next.
|
|
89
|
+
- `@theia/application-package` (from [`@theia/application-package@1.27.0-next.68+158937af474`](https://www.npmjs.com/package/@theia/application-package/v/1.27.0-next.68))
|
|
90
|
+
- `@theia/application-package/lib/api` (from [`@theia/application-package@1.27.0-next.68+158937af474`](https://www.npmjs.com/package/@theia/application-package/v/1.27.0-next.68))
|
|
91
|
+
- `@theia/application-package/lib/environment` (from [`@theia/application-package@1.27.0-next.68+158937af474`](https://www.npmjs.com/package/@theia/application-package/v/1.27.0-next.68))
|
|
92
|
+
- `@theia/request` (from [`@theia/request@1.27.0-next.68+158937af474`](https://www.npmjs.com/package/@theia/request/v/1.27.0-next.68))
|
|
93
|
+
- `@theia/request/lib/proxy` (from [`@theia/request@1.27.0-next.68+158937af474`](https://www.npmjs.com/package/@theia/request/v/1.27.0-next.68))
|
|
94
|
+
- `@theia/request/lib/node-request-service` (from [`@theia/request@1.27.0-next.68+158937af474`](https://www.npmjs.com/package/@theia/request/v/1.27.0-next.68))
|
|
95
95
|
- `fs-extra` (from [`fs-extra@^4.0.2`](https://www.npmjs.com/package/fs-extra))
|
|
96
96
|
- `fuzzy` (from [`fuzzy@^0.1.3`](https://www.npmjs.com/package/fuzzy))
|
|
97
97
|
- `inversify` (from [`inversify@^5.1.1`](https://www.npmjs.com/package/inversify))
|
|
@@ -141,6 +141,7 @@ export declare class TreeImpl implements Tree {
|
|
|
141
141
|
constructor();
|
|
142
142
|
dispose(): void;
|
|
143
143
|
get root(): TreeNode | undefined;
|
|
144
|
+
protected toDisposeOnSetRoot: DisposableCollection;
|
|
144
145
|
set root(root: TreeNode | undefined);
|
|
145
146
|
get onChanged(): Event<void>;
|
|
146
147
|
protected fireChanged(): void;
|
|
@@ -148,7 +149,7 @@ export declare class TreeImpl implements Tree {
|
|
|
148
149
|
protected fireNodeRefreshed(parent: CompositeTreeNode): Promise<void>;
|
|
149
150
|
getNode(id: string | undefined): TreeNode | undefined;
|
|
150
151
|
validateNode(node: TreeNode | undefined): TreeNode | undefined;
|
|
151
|
-
refresh(raw?: CompositeTreeNode): Promise<CompositeTreeNode | undefined>;
|
|
152
|
+
refresh(raw?: CompositeTreeNode, cancellationToken?: CancellationToken): Promise<CompositeTreeNode | undefined>;
|
|
152
153
|
protected resolveChildren(parent: CompositeTreeNode): Promise<TreeNode[]>;
|
|
153
154
|
protected setChildren(parent: CompositeTreeNode, children: TreeNode[]): Promise<CompositeTreeNode | undefined>;
|
|
154
155
|
protected removeNode(node: TreeNode | undefined): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../src/browser/tree/tree.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../src/browser/tree/tree.ts"],"names":[],"mappings":"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"}
|
package/lib/browser/tree/tree.js
CHANGED
|
@@ -138,6 +138,7 @@ let TreeImpl = class TreeImpl {
|
|
|
138
138
|
this.onDidChangeBusyEmitter = new event_1.Emitter();
|
|
139
139
|
this.onDidChangeBusy = this.onDidChangeBusyEmitter.event;
|
|
140
140
|
this.nodes = {};
|
|
141
|
+
this.toDisposeOnSetRoot = new disposable_1.DisposableCollection();
|
|
141
142
|
this.toDispose.push(this.onChangedEmitter);
|
|
142
143
|
this.toDispose.push(this.onNodeRefreshedEmitter);
|
|
143
144
|
this.toDispose.push(this.onDidChangeBusyEmitter);
|
|
@@ -150,10 +151,13 @@ let TreeImpl = class TreeImpl {
|
|
|
150
151
|
return this._root;
|
|
151
152
|
}
|
|
152
153
|
set root(root) {
|
|
154
|
+
this.toDisposeOnSetRoot.dispose();
|
|
155
|
+
const cancelRefresh = new cancellation_1.CancellationTokenSource();
|
|
156
|
+
this.toDisposeOnSetRoot.push(cancelRefresh);
|
|
153
157
|
this.nodes = {};
|
|
154
158
|
this._root = root;
|
|
155
159
|
this.addNode(root);
|
|
156
|
-
this.refresh();
|
|
160
|
+
this.refresh(undefined, cancelRefresh.token);
|
|
157
161
|
}
|
|
158
162
|
get onChanged() {
|
|
159
163
|
return this.onChangedEmitter.event;
|
|
@@ -175,7 +179,7 @@ let TreeImpl = class TreeImpl {
|
|
|
175
179
|
const id = !!node ? node.id : undefined;
|
|
176
180
|
return this.getNode(id);
|
|
177
181
|
}
|
|
178
|
-
async refresh(raw) {
|
|
182
|
+
async refresh(raw, cancellationToken) {
|
|
179
183
|
const parent = !raw ? this._root : this.validateNode(raw);
|
|
180
184
|
let result;
|
|
181
185
|
if (CompositeTreeNode.is(parent)) {
|
|
@@ -184,7 +188,13 @@ let TreeImpl = class TreeImpl {
|
|
|
184
188
|
try {
|
|
185
189
|
result = parent;
|
|
186
190
|
const children = await this.resolveChildren(parent);
|
|
191
|
+
if (cancellationToken === null || cancellationToken === void 0 ? void 0 : cancellationToken.isCancellationRequested) {
|
|
192
|
+
return;
|
|
193
|
+
}
|
|
187
194
|
result = await this.setChildren(parent, children);
|
|
195
|
+
if (cancellationToken === null || cancellationToken === void 0 ? void 0 : cancellationToken.isCancellationRequested) {
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
188
198
|
}
|
|
189
199
|
finally {
|
|
190
200
|
busySource.cancel();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../../src/browser/tree/tree.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tree.js","sourceRoot":"","sources":["../../../src/browser/tree/tree.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/core",
|
|
3
|
-
"version": "1.27.0-next.
|
|
3
|
+
"version": "1.27.0-next.68+158937af474",
|
|
4
4
|
"description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
|
|
5
5
|
"main": "lib/common/index.js",
|
|
6
6
|
"typings": "lib/common/index.d.ts",
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
"@phosphor/signaling": "1",
|
|
17
17
|
"@phosphor/virtualdom": "1",
|
|
18
18
|
"@phosphor/widgets": "1",
|
|
19
|
-
"@theia/application-package": "1.27.0-next.
|
|
20
|
-
"@theia/request": "1.27.0-next.
|
|
19
|
+
"@theia/application-package": "1.27.0-next.68+158937af474",
|
|
20
|
+
"@theia/request": "1.27.0-next.68+158937af474",
|
|
21
21
|
"@types/body-parser": "^1.16.4",
|
|
22
22
|
"@types/cookie": "^0.3.3",
|
|
23
23
|
"@types/dompurify": "^2.2.2",
|
|
@@ -200,5 +200,5 @@
|
|
|
200
200
|
"nyc": {
|
|
201
201
|
"extends": "../../configs/nyc.json"
|
|
202
202
|
},
|
|
203
|
-
"gitHead": "
|
|
203
|
+
"gitHead": "158937af47459aea882be0b034bbf144dd1a23ce"
|
|
204
204
|
}
|
package/src/browser/tree/tree.ts
CHANGED
|
@@ -258,11 +258,15 @@ export class TreeImpl implements Tree {
|
|
|
258
258
|
return this._root;
|
|
259
259
|
}
|
|
260
260
|
|
|
261
|
+
protected toDisposeOnSetRoot = new DisposableCollection();
|
|
261
262
|
set root(root: TreeNode | undefined) {
|
|
263
|
+
this.toDisposeOnSetRoot.dispose();
|
|
264
|
+
const cancelRefresh = new CancellationTokenSource();
|
|
265
|
+
this.toDisposeOnSetRoot.push(cancelRefresh);
|
|
262
266
|
this.nodes = {};
|
|
263
267
|
this._root = root;
|
|
264
268
|
this.addNode(root);
|
|
265
|
-
this.refresh();
|
|
269
|
+
this.refresh(undefined, cancelRefresh.token);
|
|
266
270
|
}
|
|
267
271
|
|
|
268
272
|
get onChanged(): Event<void> {
|
|
@@ -291,7 +295,7 @@ export class TreeImpl implements Tree {
|
|
|
291
295
|
return this.getNode(id);
|
|
292
296
|
}
|
|
293
297
|
|
|
294
|
-
async refresh(raw?: CompositeTreeNode): Promise<CompositeTreeNode | undefined> {
|
|
298
|
+
async refresh(raw?: CompositeTreeNode, cancellationToken?: CancellationToken): Promise<CompositeTreeNode | undefined> {
|
|
295
299
|
const parent = !raw ? this._root : this.validateNode(raw);
|
|
296
300
|
let result: CompositeTreeNode | undefined;
|
|
297
301
|
if (CompositeTreeNode.is(parent)) {
|
|
@@ -300,7 +304,9 @@ export class TreeImpl implements Tree {
|
|
|
300
304
|
try {
|
|
301
305
|
result = parent;
|
|
302
306
|
const children = await this.resolveChildren(parent);
|
|
307
|
+
if (cancellationToken?.isCancellationRequested) { return; }
|
|
303
308
|
result = await this.setChildren(parent, children);
|
|
309
|
+
if (cancellationToken?.isCancellationRequested) { return; }
|
|
304
310
|
} finally {
|
|
305
311
|
busySource.cancel();
|
|
306
312
|
}
|