@opensumi/ide-utils 3.4.5-next-1729601182.0 → 3.4.5-next-1729826189.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/cancellation.d.ts +5 -6
- package/lib/cancellation.d.ts.map +1 -1
- package/lib/cancellation.js +3 -13
- package/lib/cancellation.js.map +1 -1
- package/package.json +3 -3
- package/src/cancellation.ts +14 -21
package/lib/cancellation.d.ts
CHANGED
|
@@ -1,17 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { IDisposable } from './disposable';
|
|
2
2
|
export interface CancellationToken {
|
|
3
3
|
readonly isCancellationRequested: boolean;
|
|
4
4
|
/**
|
|
5
5
|
* An event emitted when cancellation is requested
|
|
6
6
|
* @event
|
|
7
7
|
*/
|
|
8
|
-
readonly onCancellationRequested:
|
|
8
|
+
readonly onCancellationRequested: (listener: (e: any) => any, thisArgs?: any, disposables?: IDisposable[]) => IDisposable;
|
|
9
9
|
}
|
|
10
10
|
export declare namespace CancellationToken {
|
|
11
|
-
function isCancellationToken(thing:
|
|
12
|
-
|
|
13
|
-
const
|
|
14
|
-
const Cancelled: CancellationToken;
|
|
11
|
+
function isCancellationToken(thing: unknown): thing is CancellationToken;
|
|
12
|
+
const None: Readonly<CancellationToken>;
|
|
13
|
+
const Cancelled: Readonly<CancellationToken>;
|
|
15
14
|
}
|
|
16
15
|
export declare class CancellationTokenSource {
|
|
17
16
|
private _token?;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancellation.d.ts","sourceRoot":"","sources":["../src/cancellation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cancellation.d.ts","sourceRoot":"","sources":["../src/cancellation.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG3C,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC;IAC1C;;;OAGG;IACH,QAAQ,CAAC,uBAAuB,EAAE,CAChC,QAAQ,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,GAAG,EACzB,QAAQ,CAAC,EAAE,GAAG,EACd,WAAW,CAAC,EAAE,WAAW,EAAE,KACxB,WAAW,CAAC;CAClB;AAWD,yBAAiB,iBAAiB,CAAC;IACjC,SAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,iBAAiB,CAc9E;IAEM,MAAM,IAAI,6BAGf,CAAC;IAEI,MAAM,SAAS,6BAGpB,CAAC;CACJ;AAsCD,qBAAa,uBAAuB;IAClC,OAAO,CAAC,MAAM,CAAC,CAAgC;IAC/C,OAAO,CAAC,eAAe,CAAC,CAA0B;gBAEtC,MAAM,CAAC,EAAE,iBAAiB;IAItC,IAAI,KAAK,IAAI,iBAAiB,CAO7B;IAED,MAAM,IAAI,IAAI;IAYd,OAAO,CAAC,MAAM,GAAE,OAAe,GAAG,IAAI;CAavC"}
|
package/lib/cancellation.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
4
4
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
5
5
|
*--------------------------------------------------------------------------------------------*/
|
|
6
|
-
// Some code copied and modified from https://github.com/microsoft/vscode/blob/1.
|
|
6
|
+
// Some code copied and modified from https://github.com/microsoft/vscode/blob/1.87.2/src/vs/base/common/cancellation.ts
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
8
|
exports.CancellationTokenSource = exports.CancellationToken = void 0;
|
|
9
9
|
const event_1 = require("./event");
|
|
@@ -31,15 +31,6 @@ var CancellationToken;
|
|
|
31
31
|
typeof thing.onCancellationRequested === 'function');
|
|
32
32
|
}
|
|
33
33
|
CancellationToken.isCancellationToken = isCancellationToken;
|
|
34
|
-
function resolveIfCancelled(token, value) {
|
|
35
|
-
return new Promise((resolve) => {
|
|
36
|
-
const listener = token.onCancellationRequested(() => {
|
|
37
|
-
listener.dispose();
|
|
38
|
-
resolve(value);
|
|
39
|
-
});
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
CancellationToken.resolveIfCancelled = resolveIfCancelled;
|
|
43
34
|
CancellationToken.None = Object.freeze({
|
|
44
35
|
isCancellationRequested: false,
|
|
45
36
|
onCancellationRequested: event_1.Event.None,
|
|
@@ -109,12 +100,11 @@ class CancellationTokenSource {
|
|
|
109
100
|
}
|
|
110
101
|
}
|
|
111
102
|
dispose(cancel = false) {
|
|
103
|
+
var _a;
|
|
112
104
|
if (cancel) {
|
|
113
105
|
this.cancel();
|
|
114
106
|
}
|
|
115
|
-
|
|
116
|
-
this._parentListener.dispose();
|
|
117
|
-
}
|
|
107
|
+
(_a = this._parentListener) === null || _a === void 0 ? void 0 : _a.dispose();
|
|
118
108
|
if (!this._token) {
|
|
119
109
|
// ensure to initialize with an empty token if we had none
|
|
120
110
|
this._token = CancellationToken.None;
|
package/lib/cancellation.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cancellation.js","sourceRoot":"","sources":["../src/cancellation.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG,wHAAwH;;;AAGxH,mCAAyC;
|
|
1
|
+
{"version":3,"file":"cancellation.js","sourceRoot":"","sources":["../src/cancellation.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-utils",
|
|
3
|
-
"version": "3.4.5-next-
|
|
3
|
+
"version": "3.4.5-next-1729826189.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -23,7 +23,7 @@
|
|
|
23
23
|
"vscode-uri": "3.0.2"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@opensumi/ide-dev-tool": "3.4.5-next-
|
|
26
|
+
"@opensumi/ide-dev-tool": "3.4.5-next-1729826189.0"
|
|
27
27
|
},
|
|
28
|
-
"gitHead": "
|
|
28
|
+
"gitHead": "19e3e7d437e19da79a5c8c253a83b58a6b10cd76"
|
|
29
29
|
}
|
package/src/cancellation.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
*--------------------------------------------------------------------------------------------*/
|
|
5
|
-
// Some code copied and modified from https://github.com/microsoft/vscode/blob/1.
|
|
5
|
+
// Some code copied and modified from https://github.com/microsoft/vscode/blob/1.87.2/src/vs/base/common/cancellation.ts
|
|
6
6
|
|
|
7
7
|
import { IDisposable } from './disposable';
|
|
8
8
|
import { Emitter, Event } from './event';
|
|
@@ -13,20 +13,24 @@ export interface CancellationToken {
|
|
|
13
13
|
* An event emitted when cancellation is requested
|
|
14
14
|
* @event
|
|
15
15
|
*/
|
|
16
|
-
readonly onCancellationRequested:
|
|
16
|
+
readonly onCancellationRequested: (
|
|
17
|
+
listener: (e: any) => any,
|
|
18
|
+
thisArgs?: any,
|
|
19
|
+
disposables?: IDisposable[],
|
|
20
|
+
) => IDisposable;
|
|
17
21
|
}
|
|
18
22
|
|
|
19
|
-
const shortcutEvent = Object.freeze(function (callback, context?): IDisposable {
|
|
23
|
+
const shortcutEvent: Event<any> = Object.freeze(function (callback, context?): IDisposable {
|
|
20
24
|
const handle = setTimeout(callback.bind(context), 0);
|
|
21
25
|
return {
|
|
22
26
|
dispose() {
|
|
23
27
|
clearTimeout(handle);
|
|
24
28
|
},
|
|
25
29
|
};
|
|
26
|
-
}
|
|
30
|
+
});
|
|
27
31
|
|
|
28
32
|
export namespace CancellationToken {
|
|
29
|
-
export function isCancellationToken(thing:
|
|
33
|
+
export function isCancellationToken(thing: unknown): thing is CancellationToken {
|
|
30
34
|
if (thing === CancellationToken.None || thing === CancellationToken.Cancelled) {
|
|
31
35
|
return true;
|
|
32
36
|
}
|
|
@@ -42,28 +46,19 @@ export namespace CancellationToken {
|
|
|
42
46
|
);
|
|
43
47
|
}
|
|
44
48
|
|
|
45
|
-
export
|
|
46
|
-
return new Promise((resolve) => {
|
|
47
|
-
const listener = token.onCancellationRequested(() => {
|
|
48
|
-
listener.dispose();
|
|
49
|
-
resolve(value);
|
|
50
|
-
});
|
|
51
|
-
});
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
export const None: CancellationToken = Object.freeze({
|
|
49
|
+
export const None = Object.freeze<CancellationToken>({
|
|
55
50
|
isCancellationRequested: false,
|
|
56
51
|
onCancellationRequested: Event.None,
|
|
57
52
|
});
|
|
58
53
|
|
|
59
|
-
export const Cancelled
|
|
54
|
+
export const Cancelled = Object.freeze<CancellationToken>({
|
|
60
55
|
isCancellationRequested: true,
|
|
61
56
|
onCancellationRequested: shortcutEvent,
|
|
62
57
|
});
|
|
63
58
|
}
|
|
64
59
|
|
|
65
60
|
class MutableToken implements CancellationToken {
|
|
66
|
-
private _isCancelled = false;
|
|
61
|
+
private _isCancelled: boolean = false;
|
|
67
62
|
private _emitter: Emitter<any> | null = null;
|
|
68
63
|
|
|
69
64
|
public cancel() {
|
|
@@ -127,13 +122,11 @@ export class CancellationTokenSource {
|
|
|
127
122
|
}
|
|
128
123
|
}
|
|
129
124
|
|
|
130
|
-
dispose(cancel = false): void {
|
|
125
|
+
dispose(cancel: boolean = false): void {
|
|
131
126
|
if (cancel) {
|
|
132
127
|
this.cancel();
|
|
133
128
|
}
|
|
134
|
-
|
|
135
|
-
this._parentListener.dispose();
|
|
136
|
-
}
|
|
129
|
+
this._parentListener?.dispose();
|
|
137
130
|
if (!this._token) {
|
|
138
131
|
// ensure to initialize with an empty token if we had none
|
|
139
132
|
this._token = CancellationToken.None;
|